weld-commits May 2009

weld-commits@lists.jboss.org

1 participants
95 discussions

[webbeans-commits] Webbeans SVN: r2713 - in extensions/trunk: logger/src/main/java/org/jboss/webbeans/log and 11 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-05-26 08:55:05 -0400 (Tue, 26 May 2009) New Revision: 2713 Modified: extensions/trunk/logger/pom.xml extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java extensions/trunk/servlet/pom.xml extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java extensions/trunk/wicket/pom.xml extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java Log: Updated Web Beans Extensions to latest JSR-299 API Modified: extensions/trunk/logger/pom.xml =================================================================== --- extensions/trunk/logger/pom.xml 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/logger/pom.xml 2009-05-26 12:55:05 UTC (rev 2713) @@ -2,7 +2,7 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0.PREVIEW1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> Modified: extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java =================================================================== --- extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.NonBinding; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.NonBinding; /** * Injects a log Modified: extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java =================================================================== --- extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -17,13 +17,10 @@ package org.jboss.webbeans.log; -import javax.inject.Current; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; -import org.jboss.webbeans.log.Log; -import org.jboss.webbeans.log.Logging; - /** * The <code>LoggerProducer</code> provides a producer method for all * @Logger annotated log objects. Each logger is application scoped Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,8 +1,8 @@ package org.jboss.webbeans.environment.se; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observes; -import javax.inject.manager.Manager; import org.jboss.webbeans.bootstrap.api.Bootstrap; import org.jboss.webbeans.environment.se.events.Shutdown; @@ -25,7 +25,7 @@ * * @param shutdownRequest */ - public void shutdown(@Observes @Shutdown Manager shutdownRequest) + public void shutdown(@Observes @Shutdown BeanManager shutdownRequest) { synchronized (this) { Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.environment.se; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.bootstrap.api.Bootstrap; import org.jboss.webbeans.bootstrap.api.Environments; @@ -78,7 +78,7 @@ new StartMain(args).main(); } - public Manager main() + public BeanManager main() { go(); return manager; Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -21,12 +21,12 @@ import java.util.Collections; import java.util.List; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Produces; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; import org.jboss.webbeans.environment.se.StartMain; import org.jboss.webbeans.environment.se.bindings.Parameters; @@ -86,7 +86,7 @@ * * @param manager The Manager which has been initialized. */ - public void initArgs(@Observes @Initialized Manager manager) { + public void initArgs(@Observes @BeforeBeanDiscovery BeanManager manager) { this.setArgs( StartMain.PARAMETERS ); } } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * Fired by webbeans SE before shutting down. Applications and modules should Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.environment.se.test; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Manager; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.environment.se.StartMain; import org.jboss.webbeans.environment.se.events.Shutdown; @@ -44,7 +44,7 @@ public void testMain() { String[] args = ARGS ; - Manager manager = new StartMain(args).main(); + BeanManager manager = new StartMain(args).main(); MainTestBean mainTestBean = manager.getInstanceByType( MainTestBean.class ); Assert.assertNotNull( mainTestBean ); @@ -79,7 +79,7 @@ @Test public void testMainEmptyArgs() { - Manager manager = new StartMain(ARGS_EMPTY).main(); + BeanManager manager = new StartMain(ARGS_EMPTY).main(); MainTestBean mainTestBean = manager.getInstanceByType( MainTestBean.class ); Assert.assertNotNull( mainTestBean ); @@ -91,7 +91,7 @@ shutdownManager(manager); } - private void shutdownManager( Manager manager ) + private void shutdownManager( BeanManager manager ) { manager.fireEvent( manager, new ShutdownAnnotation() ); } Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -16,11 +16,11 @@ */ package org.jboss.webbeans.environment.se.test.beans; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.Initializer; -import javax.inject.manager.Deployed; -import javax.inject.manager.Manager; /** * @@ -41,7 +41,7 @@ paramsTestBean.getParameters(); } - public void mainMethod(@Observes @Deployed Manager manager) { + public void mainMethod(@Observes @AfterBeanDiscovery BeanManager manager) { System.out.println( "Starting main test app" ); } Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -20,8 +20,8 @@ import java.util.List; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; import org.jboss.webbeans.environment.se.bindings.Parameters; import org.testng.Assert; Modified: extensions/trunk/servlet/pom.xml =================================================================== --- extensions/trunk/servlet/pom.xml 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/pom.xml 2009-05-26 12:55:05 UTC (rev 2713) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-version-matrix</artifactId> - <version>1.0.0.PREVIEW1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <name>Web Beans Servlet aggregator</name> Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.tomcat.examples; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class Game { Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.tomcat.examples; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped public class Generator { Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.tomcat.examples; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class TextTranslator { Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,17 +1,17 @@ package org.jboss.webbeans.test.tomcat.lookup; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; public class Mouse { - public Manager getManager() + public BeanManager getManager() { try { - return (Manager) new InitialContext().lookup("java:comp/env/app/Manager"); + return (BeanManager) new InitialContext().lookup("java:comp/env/app/Manager"); } catch (NamingException e) { Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Current; +import javax.enterprise.inject.Current; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,15 +1,15 @@ package org.jboss.webbeans.test.tomcat.lookup; import javax.annotation.Resource; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; public class Vole { @Resource(mappedName="java:comp/env/app/Manager") - Manager manager; + BeanManager manager; - public Manager getManager() + public BeanManager getManager() { return manager; } Modified: extensions/trunk/wicket/pom.xml =================================================================== --- extensions/trunk/wicket/pom.xml 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/wicket/pom.xml 2009-05-26 12:55:05 UTC (rev 2713) @@ -2,7 +2,7 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0.PREVIEW1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> Modified: extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java =================================================================== --- extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,7 +1,7 @@ package org.jboss.webbeans.wicket; -import javax.context.Conversation; -import javax.inject.manager.Manager; +import javax.enterprise.context.Conversation; +import javax.enterprise.inject.spi.BeanManager; import org.apache.wicket.IRequestTarget; import org.apache.wicket.Page; @@ -72,7 +72,7 @@ specifiedCid = request.getParameter("cid"); } - Manager manager = CurrentManager.rootManager(); + BeanManager manager = CurrentManager.rootManager(); Conversation conversation = manager.getInstanceByType(Conversation.class); // restore a conversation if it exists Modified: extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java =================================================================== --- extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java 2009-05-26 12:53:17 UTC (rev 2712) +++ extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java 2009-05-26 12:55:05 UTC (rev 2713) @@ -1,6 +1,6 @@ package org.jboss.webbeans.wicket; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import org.apache.wicket.Page; import org.apache.wicket.RequestCycle;

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2712 - in tck/trunk: api/src/main/java/org/jboss/jsr299/tck/api and 191 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-05-26 08:53:17 -0400 (Tue, 26 May 2009) New Revision: 2712 Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml tck/trunk/impl/src/main/resources/tck-audit.xml tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java tck/trunk/pom.xml tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java Log: Updated TCK to latest JSR-299 API Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.api; -import javax.context.Context; +import javax.enterprise.context.spi.Context; import org.jboss.jsr299.tck.spi.Beans; import org.jboss.jsr299.tck.spi.Contexts; Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.spi; -import javax.context.Context; +import javax.enterprise.context.spi.Context; /** Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.List; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; /** * This interface provides operations relating to a Manager. @@ -23,7 +23,7 @@ * * @return the Manager */ - public Manager getManager(); + public BeanManager getManager(); /** * Returns a list of the enabled deployment types for the current manager Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -11,8 +11,8 @@ import java.util.List; import java.util.Set; -import javax.context.Context; -import javax.inject.manager.Manager; +import javax.enterprise.context.spi.Context; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; @@ -55,15 +55,15 @@ } - private Manager currentManager; + private BeanManager currentManager; - protected void setCurrentManager(Manager currentManager) + protected void setCurrentManager(BeanManager currentManager) { this.currentManager = currentManager; } - protected Manager getCurrentManager() + protected BeanManager getCurrentManager() { return currentManager; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,64 +4,56 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.Bean; -public abstract class ForwardingBean<T> extends Bean<T> +public abstract class ForwardingBean<T> implements Bean<T> { - protected ForwardingBean(Manager manager) + protected ForwardingBean(BeanManager beanManager) { - super(manager); } protected abstract Bean<T> delegate(); - @Override public Set<Annotation> getBindings() { return delegate().getBindings(); } - @Override public Class<? extends Annotation> getDeploymentType() { return delegate().getDeploymentType(); } - @Override - public Set<? extends InjectionPoint> getInjectionPoints() + public Set<InjectionPoint> getInjectionPoints() { return delegate().getInjectionPoints(); } - @Override public String getName() { return delegate().getName(); } - @Override public Class<? extends Annotation> getScopeType() { return delegate().getScopeType(); } - @Override - public Set<? extends Type> getTypes() + public Set<Type> getTypes() { return delegate().getTypes(); } - @Override public boolean isNullable() { return delegate().isNullable(); } - @Override public boolean isSerializable() { return delegate().isSerializable(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.impl; -import javax.context.Context; +import javax.enterprise.context.spi.Context; import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.spi.Beans; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299PropertiesBasedConfigurationBuilder.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.context.Context; +import javax.enterprise.context.spi.Context; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.api.JSR299Configuration; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.literals; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Current; /** * Annotation literal for @Current Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.literals; -import javax.inject.AnnotationLiteral; -import javax.inject.New; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.New; public class NewLiteral extends AnnotationLiteral<New> implements New { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,17 +6,18 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Observer; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.UnsatisfiedDependencyException; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -37,59 +38,51 @@ DEFAULT_BINDINGS.add(new CurrentLiteral()); } - private Bean<?> createDummyBean(Manager manager, final Type injectionPointType) + private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType) { final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>(); final Set<Type> types = new HashSet<Type>(); final Set<Annotation> bindings = new HashSet<Annotation>(); bindings.add(new AnnotationLiteral<Tame>() {}); types.add(Object.class); - final Bean<?> bean = new Bean<Object>(manager) + final Bean<?> bean = new Bean<Object>() { - @Override public Set<Annotation> getBindings() { return bindings; } - @Override public Class<? extends Annotation> getDeploymentType() { return Production.class; } - @Override - public Set<? extends InjectionPoint> getInjectionPoints() + public Set<InjectionPoint> getInjectionPoints() { return injectionPoints; } - @Override public String getName() { return null; } - @Override public Class<? extends Annotation> getScopeType() { return Dependent.class; } - @Override public Set<Type> getTypes() { return types; } - @Override public boolean isNullable() { return false; } - @Override public boolean isSerializable() { return false; @@ -182,23 +175,23 @@ }) public void testBeanBelongingToParentActivityBelongsToChildActivity() { - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - Bean<?> bean = getCurrentManager().resolveByType(Cow.class).iterator().next(); - Manager childActivity = getCurrentManager().createActivity(); - assert childActivity.resolveByType(Cow.class).size() == 1; - assert childActivity.resolveByType(Cow.class).iterator().next().equals(bean); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + Bean<?> bean = getCurrentManager().getBeans(Cow.class).iterator().next(); + BeanManager childActivity = getCurrentManager().createActivity(); + assert childActivity.getBeans(Cow.class).size() == 1; + assert childActivity.getBeans(Cow.class).iterator().next().equals(bean); } @Test @SpecAssertion(section="11.6", id="c") public void testBeanBelongingToParentActivityCanBeInjectedIntoChildActivityBean() { - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - Bean<?> bean = getCurrentManager().resolveByType(Cow.class).iterator().next(); - Manager childActivity = getCurrentManager().createActivity(); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + Bean<?> bean = getCurrentManager().getBeans(Cow.class).iterator().next(); + BeanManager childActivity = getCurrentManager().createActivity(); Bean<?> dummyBean = createDummyBean(childActivity, Cow.class); childActivity.addBean(dummyBean); - assert childActivity.getInstanceToInject(dummyBean.getInjectionPoints().iterator().next()) != null; + assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), null) != null; } @Test @@ -210,7 +203,7 @@ { assert getCurrentManager().resolveObservers(new NightTime()).size() == 1; Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next(); - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); assert childActivity.resolveObservers(new NightTime()).size() == 1; assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer); } @@ -220,7 +213,7 @@ public void testObserverBelongingToParentFiresForChildActivity() { Fox.setObserved(false); - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); childActivity.fireEvent(new NightTime()); assert Fox.isObserved(); } @@ -240,7 +233,7 @@ }; getCurrentManager().addContext(context); - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); assert childActivity.getContext(Dummy.class) != null; } @@ -248,22 +241,22 @@ @SpecAssertion(section="11.6", id="o") public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean() { - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - Manager childActivity = getCurrentManager().createActivity(); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + BeanManager childActivity = getCurrentManager().createActivity(); Bean<?> dummyBean = createDummyBean(childActivity, Cow.class); childActivity.addBean(dummyBean); - assert getCurrentManager().resolveByType(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0; + assert getCurrentManager().getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0; } - @Test(expectedExceptions=UnsatisfiedDependencyException.class) + @Test(expectedExceptions=UnsatisfiedResolutionException.class) @SpecAssertion(section="11.6", id="r") public void testInstanceProcessedByParentActivity() { Context dummyContext = new DummyContext(); getCurrentManager().addContext(dummyContext); - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - final Bean<Cow> bean = getCurrentManager().resolveByType(Cow.class).iterator().next(); - Manager childActivity = getCurrentManager().createActivity(); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + final Bean<Cow> bean = getCurrentManager().getBeans(Cow.class).iterator().next(); + BeanManager childActivity = getCurrentManager().createActivity(); final Set<Annotation> bindingTypes = new HashSet<Annotation>(); bindingTypes.add(new AnnotationLiteral<Tame>() {}); childActivity.addBean(new ForwardingBean<Cow>(childActivity) @@ -289,7 +282,7 @@ @SpecAssertion(section="11.6", id="s") public void testObserverBelongingToChildDoesNotFireForParentActivity() { - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); Observer<NightTime> observer = new Observer<NightTime>() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Dummy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -13,7 +13,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Field.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.activities; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; class Field Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,14 +5,14 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.AnnotationLiteral; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.DeploymentException; -import javax.inject.Production; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -30,59 +30,51 @@ DEFAULT_BINDINGS.add(new CurrentLiteral()); } - private Bean<?> createDummyBean(Manager manager) + private Bean<?> createDummyBean(BeanManager beanManager) { final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>(); final Set<Type> types = new HashSet<Type>(); final Set<Annotation> bindings = new HashSet<Annotation>(); bindings.add(new AnnotationLiteral<SpecialBindingType>() {}); types.add(Object.class); - final Bean<?> bean = new Bean<MyBean>(manager) + final Bean<?> bean = new Bean<MyBean>() { - @Override public Set<Annotation> getBindings() { return bindings; } - @Override public Class<? extends Annotation> getDeploymentType() { return Production.class; } - @Override - public Set<? extends InjectionPoint> getInjectionPoints() + public Set<InjectionPoint> getInjectionPoints() { return injectionPoints; } - @Override public String getName() { return null; } - @Override public Class<? extends Annotation> getScopeType() { return Dependent.class; } - @Override public Set<Type> getTypes() { return types; } - @Override public boolean isNullable() { return false; } - @Override public boolean isSerializable() { return false; @@ -106,7 +98,7 @@ @SpecAssertion(section="11.6", id="t") public void testSameBeanTypeInChildAsParentInjection() { - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); Bean<?> anotherMyBean = createDummyBean(childActivity); childActivity.addBean(anotherMyBean); } @@ -115,8 +107,8 @@ @SpecAssertion(section="11.6", id="u") public void testSameBeanTypeInChildAsIndirectParentInjection() { - Manager childActivity = getCurrentManager().createActivity(); - Manager grandChildActivity = childActivity.createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); + BeanManager grandChildActivity = childActivity.createActivity(); Bean<?> anotherMyBean = createDummyBean(grandChildActivity); grandChildActivity.addBean(anotherMyBean); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Retention(RUNTIME) @Target({TYPE, METHOD, FIELD, PARAMETER}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,22 +1,22 @@ package org.jboss.jsr299.tck.tests.activities.current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; class Donkey { - Manager manager; + BeanManager beanManager; public Donkey() throws NamingException { - manager = (Manager) new InitialContext().lookup("java:app/Manager"); + beanManager = (BeanManager) new InitialContext().lookup("java:app/Manager"); } - public Manager getManager() + public BeanManager getManager() { - return manager; + return beanManager; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -13,7 +13,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.activities.current; +import javax.enterprise.inject.Initializer; import javax.event.Event; import javax.event.Fires; -import javax.inject.Initializer; class Dusk { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,16 +6,16 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Observer; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -66,7 +66,7 @@ } - private static class Daisy extends Bean<Cow> + private static class Daisy implements Bean<Cow> { private static final Set<Type> TYPES = new HashSet<Type>(); @@ -81,54 +81,45 @@ BINDING_TYPES.add(new AnnotationLiteral<Tame>() {}); } - public Daisy(Manager manager) + public Daisy(BeanManager beanManager) { - super(manager); } - @Override public Set<Annotation> getBindings() { return BINDING_TYPES; } - @Override public Class<? extends Annotation> getDeploymentType() { return Production.class; } - @Override - public Set<? extends InjectionPoint> getInjectionPoints() + public Set<InjectionPoint> getInjectionPoints() { return Collections.emptySet(); } - @Override public String getName() { return "daisy"; } - @Override public Class<? extends Annotation> getScopeType() { return Dependent.class; } - @Override public Set<Type> getTypes() { return TYPES; } - @Override public boolean isNullable() { return true; } - @Override public boolean isSerializable() { return false; @@ -163,8 +154,8 @@ { Context dummyContext = new DummyContext(); getCurrentManager().addContext(dummyContext); - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - Manager childActivity = getCurrentManager().createActivity(); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + BeanManager childActivity = getCurrentManager().createActivity(); childActivity.addBean(new Daisy(childActivity)); childActivity.setCurrent(dummyContext.getScopeType()); assert getCurrentConfiguration().getEl().evaluateValueExpression("#{daisy}", Cow.class) != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,11 +2,11 @@ import java.lang.annotation.Annotation; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observer; -import javax.inject.manager.Manager; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -66,7 +66,7 @@ { Context dummyContext = new DummyContext(); getCurrentManager().addContext(dummyContext); - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); TestableObserver<NightTime> observer = new TestableObserver<NightTime>() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Field.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.activities.current; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; class Field Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,16 +1,16 @@ package org.jboss.jsr299.tck.tests.activities.current; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; class Horse { - @Current Manager manager; + @Current BeanManager beanManager; - public Manager getManager() + public BeanManager getManager() { - return manager; + return beanManager; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,12 +2,12 @@ import java.lang.annotation.Annotation; -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observer; -import javax.inject.manager.Manager; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -65,7 +65,7 @@ DummyContext dummyContext = new DummyContext(); dummyContext.setActive(false); getCurrentManager().addContext(dummyContext); - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); childActivity.setCurrent(dummyContext.getScopeType()); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,11 +2,11 @@ import java.lang.annotation.Annotation; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observer; -import javax.inject.manager.Manager; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -62,8 +62,8 @@ { Context dummyContext = new DummyContext(); getCurrentManager().addContext(dummyContext); - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - Manager childActivity = getCurrentManager().createActivity(); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + BeanManager childActivity = getCurrentManager().createActivity(); childActivity.setCurrent(dummyContext.getScopeType()); assert getCurrentManager().getInstanceByType(Horse.class).getManager().equals(childActivity); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,16 +6,16 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Observer; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -79,7 +79,7 @@ } - private static class Daisy extends Bean<Cow> + private static class Daisy implements Bean<Cow> { private static final Set<Type> TYPES = new HashSet<Type>(); @@ -94,54 +94,45 @@ BINDING_TYPES.add(new TameLiteral()); } - public Daisy(Manager manager) + public Daisy(BeanManager beanManager) { - super(manager); } - @Override public Set<Annotation> getBindings() { return BINDING_TYPES; } - @Override public Class<? extends Annotation> getDeploymentType() { return Production.class; } - @Override - public Set<? extends InjectionPoint> getInjectionPoints() + public Set<InjectionPoint> getInjectionPoints() { return Collections.emptySet(); } - @Override public String getName() { return "daisy"; } - @Override public Class<? extends Annotation> getScopeType() { return Dependent.class; } - @Override public Set<Type> getTypes() { return TYPES; } - @Override public boolean isNullable() { return true; } - @Override public boolean isSerializable() { return false; @@ -176,8 +167,8 @@ { Context dummyContext = new DummyContext(); getCurrentManager().addContext(dummyContext); - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - Manager childActivity = getCurrentManager().createActivity(); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + BeanManager childActivity = getCurrentManager().createActivity(); childActivity.addBean(new Daisy(childActivity)); childActivity.setCurrent(dummyContext.getScopeType()); assert getCurrentManager().getInstanceByType(Field.class).get() != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,11 +2,11 @@ import java.lang.annotation.Annotation; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observer; -import javax.inject.manager.Manager; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -65,8 +65,8 @@ { Context dummyContext = new DummyContext(); getCurrentManager().addContext(dummyContext); - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - Manager childActivity = getCurrentManager().createActivity(); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + BeanManager childActivity = getCurrentManager().createActivity(); childActivity.setCurrent(dummyContext.getScopeType()); assert getCurrentManager().getInstanceByType(Donkey.class).getManager().equals(childActivity); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -13,7 +13,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,11 +2,11 @@ import java.lang.annotation.Annotation; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observer; -import javax.inject.manager.Manager; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -74,7 +74,7 @@ { Context dummyContext = new NonNormalContext(); getCurrentManager().addContext(dummyContext); - Manager childActivity = getCurrentManager().createActivity(); + BeanManager childActivity = getCurrentManager().createActivity(); childActivity.setCurrent(dummyContext.getScopeType()); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,14 +2,14 @@ import java.lang.annotation.Annotation; -import javax.context.ApplicationScoped; -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.context.SessionScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context; -import javax.context.ApplicationScoped; -import javax.context.SessionScoped; -import javax.inject.manager.Bean; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -16,7 +16,7 @@ @SpecAssertion(section = "8.1", id = "g") public void testDestroyedInstanceMustNotBeReturnedByGet() { - Bean<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + Bean<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next(); MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); assert beanInstance != null; @@ -25,7 +25,7 @@ beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean); assert beanInstance == null; - Bean<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next(); + Bean<MyApplicationBean> myApplicationBean = getCurrentManager().getBeans(MyApplicationBean.class).iterator().next(); MyCreationalContext<MyApplicationBean> myCreationalContextForApplication = new MyCreationalContext<MyApplicationBean>(); MyApplicationBean myApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myCreationalContextForApplication); assert myApplicationBeanInstance != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context; -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.SessionScoped; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -21,7 +21,7 @@ assert sessionContext.isActive(); setContextInactive(sessionContext); - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next(); sessionContext.get(mySessionBean); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context; -import javax.context.ApplicationScoped; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.SessionScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -17,10 +17,10 @@ @SpecAssertion(section = "8.1", id = "e") public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven() { - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next(); assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; - Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next(); + Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().getBeans(MyApplicationBean.class).iterator().next(); assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean) == null; // Now try same operation with a CreationalContext Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context; -import javax.context.Contextual; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.spi.Contextual; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -15,7 +15,7 @@ @SpecAssertion(section = "8.1", id = "b") public void testGetWithoutCreationalContextReturnsNull() { - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next(); assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context; -import javax.context.ContextNotActiveException; -import javax.context.RequestScoped; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.RequestScoped; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyApplicationBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class MyApplicationBean implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyContextual.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,68 +8,59 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.SessionScoped; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.Bean; -class MyContextual extends Bean<MySessionBean> +class MyContextual implements Bean<MySessionBean> { private boolean createCalled = false; private boolean destroyCalled = false; private boolean shouldReturnNullInstances = false; - protected MyContextual(Manager manager) + protected MyContextual(BeanManager beanManager) { - super(manager); } - @Override public Set<Annotation> getBindings() { return Collections.emptySet(); } - @Override public Class<? extends Annotation> getDeploymentType() { return Standard.class; } - @Override - public Set<? extends InjectionPoint> getInjectionPoints() + public Set<InjectionPoint> getInjectionPoints() { return Collections.emptySet(); } - @Override public String getName() { return "my-session-bean"; } - @Override public Class<? extends Annotation> getScopeType() { return SessionScoped.class; } @SuppressWarnings("unchecked") - @Override public Set<Type> getTypes() { return new HashSet<Type>(Arrays.asList(Object.class, MySessionBean.class, Serializable.class)); } - @Override public boolean isNullable() { return false; } - @Override public boolean isSerializable() { return true; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; class MyCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MySessionBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SessionScoped class MySessionBean implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -31,7 +31,7 @@ } ) public void testGetReturnsExistingInstance() { - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); + Contextual<MySessionBean> mySessionBean = getCurrentManager().getBeans(MySessionBean.class).iterator().next(); MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); assert beanInstance != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanA.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SessionScoped public class SimpleBeanA implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanB.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SessionScoped public class SimpleBeanB implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/SimpleBeanZ.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SessionScoped public class SimpleBeanZ implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/FilterTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.context.ApplicationScoped; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -16,7 +16,7 @@ public class FilterTest implements Filter { @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; public void destroy() { @@ -43,7 +43,7 @@ if (jsr299Manager == null) { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } } catch (Exception e) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletConfig; @@ -17,7 +17,7 @@ private static final long serialVersionUID = 1L; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -34,7 +34,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -19,9 +19,9 @@ import java.io.IOException; -import javax.context.ApplicationScoped; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletConfig; @@ -42,7 +42,7 @@ private static final long serialVersionUID = 1L; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -71,7 +71,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/SimpleApplicationBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.application; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class SimpleApplicationBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/BirdFeederService.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context.application.ejb; -import javax.context.ApplicationScoped; import javax.ejb.Stateless; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.jws.WebMethod; import javax.jws.WebService; @@ -12,7 +12,7 @@ public class BirdFeederService implements FeederService { @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; private static boolean applicationScopeActive = false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,13 +1,13 @@ package org.jboss.jsr299.tck.tests.context.application.ejb; import javax.annotation.Resource; -import javax.context.ApplicationScoped; import javax.ejb.Stateless; import javax.ejb.Timeout; import javax.ejb.Timer; import javax.ejb.TimerService; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; @Stateless public class FMSModelIII implements FMS @@ -18,7 +18,7 @@ private TimerService timerService; @Current - private Manager manager; + private BeanManager beanManager; private static boolean applicationScopeActive = false; private static double beanId = 0.0d; @@ -47,19 +47,19 @@ @Timeout public void timeout(Timer timer) { - if (manager.getContext(ApplicationScoped.class).isActive()) + if (beanManager.getContext(ApplicationScoped.class).isActive()) { applicationScopeActive = true; if (beanId > 0.0) { - if (beanId == manager.getInstanceByType(SimpleApplicationBean.class).getId()) + if (beanId == beanManager.getInstanceByType(SimpleApplicationBean.class).getId()) { sameBean = true; } } else { - beanId = manager.getInstanceByType(SimpleApplicationBean.class).getId(); + beanId = beanManager.getInstanceByType(SimpleApplicationBean.class).getId(); } } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/SimpleApplicationBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.application.ejb; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class SimpleApplicationBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/SimpleApplicationBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.application.standalone; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class SimpleApplicationBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,21 +1,21 @@ package org.jboss.jsr299.tck.tests.context.application.standalone; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Asynchronously; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Manager; class TcasDisplay { @Current - private Manager manager; + private BeanManager beanManager; private static boolean applicationScopeActive = false; public void drawTarget(@Observes @Asynchronously TargetEvent targetEvent) { - if (manager.getContext(ApplicationScoped.class).isActive()) + if (beanManager.getContext(ApplicationScoped.class).isActive()) { applicationScopeActive = true; } @@ -27,7 +27,7 @@ public void drawNearMiss(@Observes @Asynchronously NearMiss event) { - event.setBean(manager.getInstanceByType(SimpleApplicationBean.class)); + event.setBean(beanManager.getInstanceByType(SimpleApplicationBean.class)); } public static boolean isApplicationScopeActive() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,18 +1,18 @@ package org.jboss.jsr299.tck.tests.context.application.standalone; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Asynchronously; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Manager; class TcasToFmsLink { @Current - private Manager manager; + private BeanManager beanManager; public void avoidanceAction(@Observes @Asynchronously NearMiss event) { - event.setBean(manager.getInstanceByType(SimpleApplicationBean.class)); + event.setBean(beanManager.getInstanceByType(SimpleApplicationBean.class)); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.conversation; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,10 +2,10 @@ import java.lang.annotation.Annotation; -import javax.context.Conversation; -import javax.context.RequestScoped; -import javax.inject.Current; -import javax.inject.Standard; +import javax.enterprise.context.Conversation; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.Standard; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -34,21 +34,21 @@ @SpecAssertion(section = "8.5.4", id = "ia") public void testBeanWithTypeConversation() { - assert getCurrentManager().resolveByType(Conversation.class).size() == 1; + assert getCurrentManager().getBeans(Conversation.class).size() == 1; } @Test(groups = { "contexts" }) @SpecAssertion(section = "8.5.4", id = "ib") public void testBeanWithRequestScope() { - assert getCurrentManager().resolveByType(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test(groups = { "contexts" }) @SpecAssertion(section = "8.5.4", id = "ic") public void testBeanWithDeploymentTypeStandard() { - assert getCurrentManager().resolveByType(Conversation.class).iterator().next().getDeploymentType().equals(Standard.class); + assert getCurrentManager().getBeans(Conversation.class).iterator().next().getDeploymentType().equals(Standard.class); } @Test(groups = { "contexts" }) @@ -56,7 +56,7 @@ public void testBeanWithBindingCurrent() { boolean found = false; - for (Annotation binding : getCurrentManager().resolveByType(Conversation.class).iterator().next().getBindings()) + for (Annotation binding : getCurrentManager().getBeans(Conversation.class).iterator().next().getBindings()) { if (binding.annotationType().equals(Current.class)) { @@ -70,7 +70,7 @@ @SpecAssertion(section = "8.5.4", id = "ie") public void testBeanWithNameJavaxContextConversation() { - assert getCurrentManager().resolveByType(Conversation.class).iterator().next().getName().equals("javax.context.conversation"); + assert getCurrentManager().getBeans(Conversation.class).iterator().next().getName().equals("javax.context.conversation"); } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.conversation; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.conversation; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.conversation; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.annotation.Named; import javax.annotation.PreDestroy; -import javax.context.ConversationScoped; +import javax.enterprise.context.ConversationScoped; +import javax.enterprise.inject.Named; @ConversationScoped @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; -import javax.annotation.Named; -import javax.context.Conversation; -import javax.inject.Current; +import javax.enterprise.context.Conversation; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; @Named public class CloudController Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,7 +3,7 @@ import java.io.IOException; import java.io.ObjectOutputStream; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; -import javax.context.ContextNotActiveException; -import javax.context.Conversation; -import javax.context.ConversationScoped; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.Conversation; +import javax.enterprise.context.ConversationScoped; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Storm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.Conversation; -import javax.context.ConversationScoped; -import javax.inject.Current; +import javax.enterprise.context.Conversation; +import javax.enterprise.context.ConversationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; @Named @ConversationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,21 +1,21 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.context.ApplicationScoped; -import javax.context.Dependent; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Manager; @ApplicationScoped class ApplicationHorseStable { @Current - private Manager manager; + private BeanManager beanManager; private static boolean dependentContextActive = false; public void horseEntered(@Observes HorseInStableEvent horseEvent) { - if (manager.getContext(Dependent.class).isActive()) + if (beanManager.getContext(Dependent.class).isActive()) { dependentContextActive = true; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,12 +3,12 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -31,9 +31,9 @@ @SpecAssertion(section = "8.3", id = "a") public void testInstanceNotSharedBetweenInjectionPoints() { - Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class); + Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class); assert foxBeans.size() == 1; - Set<Bean<FoxRun>> foxRunBeans = getCurrentManager().resolveByType(FoxRun.class); + Set<Bean<FoxRun>> foxRunBeans = getCurrentManager().getBeans(FoxRun.class); assert foxRunBeans.size() == 1; Bean<FoxRun> foxRunBean = foxRunBeans.iterator().next(); FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>()); @@ -49,7 +49,7 @@ @Override protected void execute() throws Exception { - Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class); + Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class); assert foxBeans.size() == 1; Fox fox1 = getCurrentConfiguration().getEl().evaluateValueExpression("#{fox}", Fox.class); @@ -63,7 +63,7 @@ @SpecAssertion(section = "8.3", id = "d") public void testInstanceUsedForProducerMethodNotShared() throws Exception { - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>()); assert tarantula != null; @@ -75,7 +75,7 @@ @SpecAssertion(section = "8.3", id = "d") public void testInstanceUsedForProducerFieldNotShared() throws Exception { - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).iterator().next(); Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); Tarantula tarantula2 = tarantulaBean.create(new MockCreationalContext<Tarantula>()); assert tarantula != null; @@ -94,7 +94,7 @@ protected void execute() throws Exception { SpiderProducer spiderProducer = getCurrentManager().getInstanceByType(SpiderProducer.class); - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); Tarantula tarantula = getCurrentManager().getInstanceByType(Tarantula.class); assert tarantula != null; tarantulaBean.destroy(tarantula); @@ -134,7 +134,7 @@ @Override protected void execute() throws Exception { - Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class); + Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class); assert foxBeans.size() == 1; Bean<Fox> foxBean = foxBeans.iterator().next(); Context context = getCurrentManager().getContext(Dependent.class); @@ -155,7 +155,7 @@ @Override protected void execute() throws Exception { - Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class); + Set<Bean<Fox>> foxBeans = getCurrentManager().getBeans(Fox.class); assert foxBeans.size() == 1; Bean<Fox> foxBean = foxBeans.iterator().next(); Context context = getCurrentManager().getContext(Dependent.class); @@ -177,7 +177,7 @@ @SpecAssertion(section = "8.3", id = "g") public void testContextIsActiveWhenInvokingProducerMethod() { - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); assert tarantula != null; assert SpiderProducer.isDependentContextActive(); @@ -200,7 +200,7 @@ }) public void testContextIsActiveWhenInvokingDisposalMethod() { - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); Tarantula tarantula = tarantulaBean.create(new CreationalContext<Tarantula>() { @@ -273,7 +273,7 @@ @SpecAssertion(section = "8.3", id = "j") public void testContextIsActiveDuringInjection() { - Bean<FoxRun> foxRunBean = getCurrentManager().resolveByType(FoxRun.class).iterator().next(); + Bean<FoxRun> foxRunBean = getCurrentManager().getBeans(FoxRun.class).iterator().next(); FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>()); assert foxRun.fox != null; } @@ -291,8 +291,8 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByType(Farm.class).size() == 1; - Bean<Farm> farmBean = getCurrentManager().resolveByType(Farm.class).iterator().next(); + assert getCurrentManager().getBeans(Farm.class).size() == 1; + Bean<Farm> farmBean = getCurrentManager().getBeans(Farm.class).iterator().next(); Farm farm = getCurrentManager().getInstanceByType(Farm.class); farm.open(); Stable.destroyed = false; @@ -322,8 +322,8 @@ Fox.setDestroyed(false); Fox.setDestroyCount(0); - assert getCurrentManager().resolveByType(FoxRun.class).size() == 1; - Bean<FoxRun> bean = getCurrentManager().resolveByType(FoxRun.class).iterator().next(); + assert getCurrentManager().getBeans(FoxRun.class).size() == 1; + Bean<FoxRun> bean = getCurrentManager().getBeans(FoxRun.class).iterator().next(); FoxRun instance = getCurrentManager().getInstanceByType(FoxRun.class); assert instance.fox != instance.anotherFox; bean.destroy(instance); @@ -406,7 +406,7 @@ @Override protected void execute() throws Exception { - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); assert tarantula != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Farm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.context.RequestScoped; -import javax.inject.Current; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; @RequestScoped class Farm Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.annotation.Named; import javax.annotation.PreDestroy; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Named; @Dependent @Named class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/FoxRun.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.annotation.Named; import javax.annotation.PreDestroy; -import javax.inject.Current; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; @Named("foxRun") class FoxRun Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,11 +1,11 @@ package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.PreDestroy; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.Initializer; -import javax.inject.manager.Manager; @Dependent class HorseStable @@ -15,9 +15,9 @@ private static boolean destroyed = false; @Initializer - public HorseStable(@Current Manager manager) + public HorseStable(@Current BeanManager beanManager) { - if (manager.getContext(Dependent.class).isActive()) + if (beanManager.getContext(Dependent.class).isActive()) { dependentContextActive = true; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; public class MockCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/OtherSpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.PreDestroy; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class OtherSpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,14 +1,14 @@ package org.jboss.jsr299.tck.tests.context.dependent; -import javax.annotation.Named; -import javax.context.Dependent; -import javax.inject.manager.Manager; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.spi.BeanManager; @Dependent @Named public class SensitiveFox { - private static Manager manager; + private static BeanManager beanManager; private boolean dependentContextActiveDuringCreate = false; @@ -16,7 +16,7 @@ public SensitiveFox() { - if (manager.getContext(Dependent.class).isActive()) + if (beanManager.getContext(Dependent.class).isActive()) { dependentContextActiveDuringCreate = true; } @@ -24,7 +24,7 @@ public String getName() { - if (manager.getContext(Dependent.class).isActive()) + if (beanManager.getContext(Dependent.class).isActive()) { dependentContextActiveDuringEval = true; } @@ -41,9 +41,9 @@ return dependentContextActiveDuringEval; } - public static void setManager(Manager manager) + public static void setManager(BeanManager beanManager) { - SensitiveFox.manager = manager; + SensitiveFox.beanManager = beanManager; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,17 +1,17 @@ package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.PreDestroy; -import javax.context.Dependent; -import javax.inject.Current; -import javax.inject.Disposes; -import javax.inject.Produces; -import javax.inject.manager.Manager; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.BeanManager; @AnotherDeploymentType class SpiderProducer { @Current - private Manager manager; + private BeanManager beanManager; private static boolean dependentContextActive = false; private static boolean destroyed = false; @@ -20,7 +20,7 @@ @Produces public Tarantula produceTarantula() { - if (manager.getContext(Dependent.class).isActive()) + if (beanManager.getContext(Dependent.class).isActive()) { dependentContextActive = true; } @@ -29,7 +29,7 @@ public void disposeTarantula(@Disposes Tarantula tarantula) { - if (manager.getContext(Dependent.class).isActive()) + if (beanManager.getContext(Dependent.class).isActive()) { dependentContextActive = true; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Stable.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.dependent; import javax.annotation.PreDestroy; -import javax.inject.Current; +import javax.enterprise.inject.Current; class Stable { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,9 +17,9 @@ package org.jboss.jsr299.tck.tests.context.dependent.ejb; -import javax.context.CreationalContext; -import javax.context.RequestScoped; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -41,7 +41,7 @@ @SpecAssertion(section = "8.3", id = "k") public void testContextIsActiveDuringEJBDependencyInjection() { - Bean<FoxRunLocal> foxRunBean = getCurrentManager().resolveByType(FoxRunLocal.class).iterator().next(); + Bean<FoxRunLocal> foxRunBean = getCurrentManager().getBeans(FoxRunLocal.class).iterator().next(); FoxRunLocal foxRun = foxRunBean.create(new CreationalContext<FoxRunLocal>(){ public void push(FoxRunLocal incompleteInstance) {} @@ -69,8 +69,8 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByType(HouseLocal.class).size() == 1; - Bean<HouseLocal> bean = getCurrentManager().resolveByType(HouseLocal.class).iterator().next(); + assert getCurrentManager().getBeans(HouseLocal.class).size() == 1; + Bean<HouseLocal> bean = getCurrentManager().getBeans(HouseLocal.class).iterator().next(); HouseLocal instance = getCurrentManager().getContext(RequestScoped.class).get(bean, new CreationalContext<HouseLocal>(){ public void push(HouseLocal incompleteInstance) {} @@ -96,8 +96,8 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByType(FarmLocal.class).size() == 1; - Bean<FarmLocal> farmBean = getCurrentManager().resolveByType(FarmLocal.class).iterator().next(); + assert getCurrentManager().getBeans(FarmLocal.class).size() == 1; + Bean<FarmLocal> farmBean = getCurrentManager().getBeans(FarmLocal.class).iterator().next(); FarmLocal farm = getCurrentManager().getContext(RequestScoped.class).get(farmBean, new CreationalContext<FarmLocal>(){ public void push(FarmLocal incompleteInstance) {} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.dependent.ejb; -import javax.context.RequestScoped; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; @RequestScoped @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,14 +1,14 @@ package org.jboss.jsr299.tck.tests.context.dependent.ejb; -import javax.annotation.Named; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.context.ContextNotActiveException; -import javax.context.Dependent; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.spi.BeanManager; @Dependent @Named @Stateful public class Fox implements FoxLocal @@ -19,14 +19,14 @@ private static boolean dependentContextActiveDuringPostConstruct = false; @Current - private Manager manager; + private BeanManager beanManager; @PostConstruct public void construct() { try { - dependentContextActiveDuringPostConstruct = manager.getContext(Dependent.class).isActive(); + dependentContextActiveDuringPostConstruct = beanManager.getContext(Dependent.class).isActive(); } catch (ContextNotActiveException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/FoxRun.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,10 +1,10 @@ package org.jboss.jsr299.tck.tests.context.dependent.ejb; -import javax.annotation.Named; import javax.annotation.PreDestroy; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; @Named("foxRun") @Stateful public class FoxRun implements FoxRunLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.dependent.ejb; -import javax.context.RequestScoped; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; @RequestScoped @Stateful class House implements HouseLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import javax.annotation.PreDestroy; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.inject.Current; @Stateful class Room implements RoomLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Stable.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,7 +3,7 @@ import java.io.Serializable; import javax.annotation.PreDestroy; -import javax.inject.Current; +import javax.enterprise.inject.Current; class Stable implements Serializable { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Big.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; import javax.interceptor.InterceptorBindingType; @InterceptorBindingType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.Dependent; -import javax.context.SessionScoped; -import javax.inject.Produces; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class CityProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityProducer2.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.Dependent; -import javax.inject.Produces; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class CityProducer2 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/FooConsumer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.RequestScoped; -import javax.inject.Current; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; @RequestScoped class FooConsumer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Generator.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,8 +3,8 @@ import java.io.Serializable; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Helsinki.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.Dependent; import javax.ejb.Stateful; +import javax.enterprise.context.Dependent; @Dependent @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Hyvinkaa.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jamsa_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Produces; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Produces; @SessionScoped @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Joensuu.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Jyvaskyla.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kajaani.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SessionScoped public class Kajaani implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Kuopio_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Initializer; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Initializer; @SessionScoped class Kuopio_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/London_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Produces; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Produces; @SessionScoped @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Loviisa_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Initializer; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Initializer; @SessionScoped class Loviisa_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Mikkeli_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; @SessionScoped class Mikkeli_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Nokia_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SessionScoped class Nokia_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/NumberConsumer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.RequestScoped; -import javax.inject.Current; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; @RequestScoped class NumberConsumer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,11 +4,11 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.context.Context; -import javax.context.SessionScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.IllegalProductException; -import javax.inject.manager.Bean; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.IllegalProductException; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -38,7 +38,7 @@ @SpecAssertion(section = "8.4", id = "b") public void testSimpleWebBeanWithSerializableImplementationClassOK() { - Set<Bean<Jyvaskyla>> beans = getCurrentManager().resolveByType(Jyvaskyla.class); + Set<Bean<Jyvaskyla>> beans = getCurrentManager().getBeans(Jyvaskyla.class); assert !beans.isEmpty(); } @@ -88,7 +88,7 @@ @SpecAssertion(section = "8.4", id = "j") public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException { - Set<Bean<Vaasa>> vaasaBeans = getCurrentManager().resolveByType(Vaasa.class); + Set<Bean<Vaasa>> vaasaBeans = getCurrentManager().getBeans(Vaasa.class); assert vaasaBeans.size() == 1; assert testSerialize(vaasaBeans.iterator().next()); } @@ -97,7 +97,7 @@ @SpecAssertion(section = "8.4", id = "l") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK() { - Set<Bean<Joensuu>> beans = getCurrentManager().resolveByType(Joensuu.class); + Set<Bean<Joensuu>> beans = getCurrentManager().getBeans(Joensuu.class); assert !beans.isEmpty(); } @@ -112,7 +112,7 @@ @SpecAssertion(section = "8.4", id = "q") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() { - Set<Bean<Hyvinkaa>> beans = getCurrentManager().resolveByType(Hyvinkaa.class); + Set<Bean<Hyvinkaa>> beans = getCurrentManager().getBeans(Hyvinkaa.class); assert !beans.isEmpty(); } @@ -176,7 +176,7 @@ @SpecAssertion(section = "8.4", id = "a") public void testEJBWebBeanCanDeclarePassivatingScope() { - assert getCurrentManager().resolveByType(TurkuLocal.class).size() == 1; + assert getCurrentManager().getBeans(TurkuLocal.class).size() == 1; } @Test(expectedExceptions = IllegalProductException.class) @@ -190,7 +190,7 @@ @SpecAssertion(section = "8.4", id = "v") public void testIsSerializableOnBean() { - assert !getCurrentManager().resolveByType(Sysma.class).iterator().next().isSerializable(); - assert getCurrentManager().resolveByType(Hyvinkaa.class).iterator().next().isSerializable(); + assert !getCurrentManager().getBeans(Sysma.class).iterator().next().isSerializable(); + assert getCurrentManager().getBeans(Hyvinkaa.class).iterator().next().isSerializable(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Salo_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SessionScoped class Salo_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Turku.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Uusikaupunki_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SessionScoped class Uusikaupunki_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Vaasa.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SuppressWarnings("serial") @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Violation Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Violation2.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Violation2 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/CityBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; import javax.interceptor.InterceptorBindingType; @InterceptorBindingType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken1/Kaarina_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken1; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/Hamina_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken2; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SessionScoped class Hamina_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken3/Porvoo_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken3; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/CityBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; import javax.interceptor.InterceptorBindingType; @InterceptorBindingType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken4/Kotka_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SessionScoped class Kotka_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken5/Raisio_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SessionScoped class Raisio_Broken implements CityInterface, Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Vantaa_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @SessionScoped class Vantaa_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/Violation.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken6; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Violation Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Loviisa_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; @SessionScoped class Loviisa_Broken extends City implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/Violation.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken7; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Violation Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Forssa_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; @SessionScoped class Forssa_Broken implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/Violation.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken8; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Violation Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Peraseinajoki.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken9; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Produces; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Produces; class Peraseinajoki extends City { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken9; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Violation Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken9/Violation2.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken9; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Violation2 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @BindingType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.integration; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class CowProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.IllegalProductException; +import javax.enterprise.inject.IllegalProductException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class District Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/FilterTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.context.ApplicationScoped; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -16,7 +16,7 @@ public class FilterTest implements Filter { @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; public void destroy() { @@ -43,7 +43,7 @@ if (jsr299Manager == null) { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } } catch (Exception e) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletConfig; @@ -17,7 +17,7 @@ private static final long serialVersionUID = 1L; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -34,7 +34,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -19,9 +19,9 @@ import java.io.IOException; -import javax.context.ApplicationScoped; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletConfig; @@ -42,7 +42,7 @@ private static final long serialVersionUID = 1L; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -71,7 +71,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/SimpleRequestBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.request; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped public class SimpleRequestBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,13 +1,13 @@ package org.jboss.jsr299.tck.tests.context.request.ejb; import javax.annotation.Resource; -import javax.context.RequestScoped; import javax.ejb.Stateless; import javax.ejb.Timeout; import javax.ejb.Timer; import javax.ejb.TimerService; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; @Stateless public class FMSModelIII implements FMS @@ -18,7 +18,7 @@ private TimerService timerService; @Current - private Manager manager; + private BeanManager beanManager; private static boolean requestScopeActive = false; private static double beanId = 0.0d; @@ -47,19 +47,19 @@ @Timeout public void timeout(Timer timer) { - if (manager.getContext(RequestScoped.class).isActive()) + if (beanManager.getContext(RequestScoped.class).isActive()) { requestScopeActive = true; if (beanId > 0.0) { - if (beanId == manager.getInstanceByType(SimpleRequestBean.class).getId()) + if (beanId == beanManager.getInstanceByType(SimpleRequestBean.class).getId()) { sameBean = true; } } else { - beanId = manager.getInstanceByType(SimpleRequestBean.class).getId(); + beanId = beanManager.getInstanceByType(SimpleRequestBean.class).getId(); } } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/SimpleRequestBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.context.request.ejb; import javax.annotation.PreDestroy; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class SimpleRequestBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/SimpleRequestBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.context.request.standalone; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class SimpleRequestBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,21 +1,21 @@ package org.jboss.jsr299.tck.tests.context.request.standalone; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Asynchronously; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Manager; class TcasDisplay { @Current - private Manager manager; + private BeanManager beanManager; private static boolean requestScopeActive = false; public void drawTarget(@Observes @Asynchronously TargetEvent targetEvent) { - if (manager.getContext(RequestScoped.class).isActive()) + if (beanManager.getContext(RequestScoped.class).isActive()) { requestScopeActive = true; } @@ -27,7 +27,7 @@ public void drawNearMiss(@Observes @Asynchronously NearMiss event) { - event.setBean(manager.getInstanceByType(SimpleRequestBean.class)); + event.setBean(beanManager.getInstanceByType(SimpleRequestBean.class)); } public static boolean isRequestScopeActive() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/FilterTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -16,7 +16,7 @@ public class FilterTest implements Filter { @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; public void destroy() { @@ -43,7 +43,7 @@ if (jsr299Manager == null) { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } } catch (Exception e) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -19,8 +19,8 @@ import java.io.IOException; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletConfig; @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -57,7 +57,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletConfig; @@ -17,7 +17,7 @@ private static final long serialVersionUID = 1L; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -49,7 +49,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -19,9 +19,9 @@ import java.io.IOException; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletConfig; @@ -42,7 +42,7 @@ private static final long serialVersionUID = 1L; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -71,7 +71,7 @@ try { InitialContext ic = new InitialContext(); - jsr299Manager = (Manager) ic.lookup("java:app/Manager"); + jsr299Manager = (BeanManager) ic.lookup("java:app/Manager"); } catch (NamingException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,7 +3,7 @@ import java.io.Serializable; import javax.annotation.PreDestroy; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @SessionScoped class SimpleSessionBean implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,10 +2,11 @@ import java.lang.annotation.Annotation; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -33,16 +34,16 @@ @SpecAssertion(section = "2", id = "a") public void testBeanTypesNonEmpty() { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; - assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getTypes().size() > 0; + assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; + assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getTypes().size() > 0; } @Test @SpecAssertion(section = "2", id = "b") public void testBindingTypesNonEmpty() { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; - assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getBindings().size() > 0; + assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; + assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getBindings().size() > 0; } @Test @@ -53,8 +54,8 @@ }) public void testHasScopeType() { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; - assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; + assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @@ -65,19 +66,19 @@ }) public void testHasDeploymentType() { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; - assert getCurrentManager().resolveByType(RedSnapper.class).iterator().next().getDeploymentType().equals(Production.class); + assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; + assert getCurrentManager().getBeans(RedSnapper.class).iterator().next().getDeploymentType().equals(Production.class); } @Test(groups = "producerMethod") @SpecAssertion(section = "5.2", id = "b") public void testIsNullable() throws Exception { - assert getCurrentManager().resolveByType(int.class).size() == 1; - Bean<Integer> bean = getCurrentManager().resolveByType(int.class).iterator().next(); + assert getCurrentManager().getBeans(int.class).size() == 1; + Bean<Integer> bean = getCurrentManager().getBeans(int.class).iterator().next(); assert !bean.isNullable(); - assert getCurrentManager().resolveByType(Animal.class, TAME_LITERAL).size() == 1; - Bean<Animal> animalBean = getCurrentManager().resolveByType(Animal.class, TAME_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(Animal.class, TAME_LITERAL).size() == 1; + Bean<Animal> animalBean = getCurrentManager().getBeans(Animal.class, TAME_LITERAL).iterator().next(); assert animalBean.isNullable(); } @@ -93,8 +94,8 @@ }) public void testBeanTypes() { - assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; - Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + assert getCurrentManager().getBeans(Tarantula.class).size() == 1; + Bean<Tarantula> bean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); assert bean.getTypes().size() == 6; assert bean.getTypes().contains(Tarantula.class); assert bean.getTypes().contains(Spider.class); @@ -109,8 +110,8 @@ @SuppressWarnings("unused") public void testBeanClientCanCastBeanInstanceToAnyBeanType() { - assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; - Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + assert getCurrentManager().getBeans(Tarantula.class).size() == 1; + Bean<Tarantula> bean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); Tarantula tarantula = getCurrentManager().getInstance(bean); Spider spider = (Spider) tarantula; @@ -124,14 +125,14 @@ @SpecAssertion(section = "2.2", id = "g") public void testFinalApiType() { - assert !getCurrentManager().resolveByType(DependentFinalTuna.class).isEmpty(); + assert !getCurrentManager().getBeans(DependentFinalTuna.class).isEmpty(); } @Test @SpecAssertion(section = "3.2.3", id = "bd") public void testMultipleStereotypes() { - Bean<ComplicatedTuna> tunaBean = getCurrentManager().resolveByType(ComplicatedTuna.class).iterator().next(); + Bean<ComplicatedTuna> tunaBean = getCurrentManager().getBeans(ComplicatedTuna.class).iterator().next(); assert tunaBean.getScopeType().equals(RequestScoped.class); assert tunaBean.getName().equals("complicatedTuna"); } @@ -140,8 +141,8 @@ @SpecAssertion(section = "3.2.3", id = "c") public void testBeanExtendsAnotherBean() { - assert !getCurrentManager().resolveByType(Spider.class).isEmpty(); - assert !getCurrentManager().resolveByType(Tarantula.class).isEmpty(); + assert !getCurrentManager().getBeans(Spider.class).isEmpty(); + assert !getCurrentManager().getBeans(Tarantula.class).isEmpty(); } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/ComplicatedTuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.bean; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @FishStereotype @AnimalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/FishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.bean; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.bean; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class SpiderProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,11 +3,11 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; -import javax.inject.Production; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.InjectionPoint; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -26,7 +26,7 @@ @SpecAssertion(section = "2.3.1", id = "a") public void testDefaultBindingDeclaredInJava() { - Bean<Order> order = getCurrentManager().resolveByType(Order.class).iterator().next(); + Bean<Order> order = getCurrentManager().getBeans(Order.class).iterator().next(); assert order.getBindings().size() == 1; order.getBindings().iterator().next().annotationType().equals(Production.class); } @@ -35,7 +35,7 @@ @SpecAssertion(section = "2.3.1", id = "b") public void testDefaultBindingForInjectionPoint() { - Bean<Order> order = getCurrentManager().resolveByType(Order.class).iterator().next(); + Bean<Order> order = getCurrentManager().getBeans(Order.class).iterator().next(); InjectionPoint injectionPoint = order.getInjectionPoints().iterator().next(); assert injectionPoint.getBean().getBindings().iterator().next().annotationType().equals(Current.class); } @@ -44,14 +44,14 @@ @SpecAssertion(section = "2.3.2", id = "b") public void testBindingDeclaresBindingAnnotation() { - assert !getCurrentManager().resolveByType(Tarantula.class, new TameBinding()).isEmpty(); + assert !getCurrentManager().getBeans(Tarantula.class, new TameBinding()).isEmpty(); } @Test @SpecAssertion(section = "2.3.3", id = "a") public void testBindingsDeclaredInJava() { - Bean<Cat> cat = getCurrentManager().resolveByType(Cat.class, new SynchronousBinding()).iterator().next(); + Bean<Cat> cat = getCurrentManager().getBeans(Cat.class, new SynchronousBinding()).iterator().next(); assert cat.getBindings().size() == 1; assert cat.getBindings().contains(new SynchronousBinding()); } @@ -63,7 +63,7 @@ }) public void testMultipleBindings() { - Bean<?> model = getCurrentManager().resolveByType(Cod.class, new ChunkyBinding(true), new WhitefishBinding()).iterator().next(); + Bean<?> model = getCurrentManager().getBeans(Cod.class, new ChunkyBinding(true), new WhitefishBinding()).iterator().next(); assert model.getBindings().size() == 2; } @@ -71,7 +71,7 @@ @SpecAssertion(section = "2.3.5", id = "a") public void testFieldInjectedFromProducerMethod() throws Exception { - Barn barn = getCurrentManager().resolveByType(Barn.class).iterator().next().create(new MockCreationalContext<Barn>()); + Barn barn = getCurrentManager().getBeans(Barn.class).iterator().next().create(new MockCreationalContext<Barn>()); assert barn.petSpider != null; assert barn.petSpider instanceof DefangedTarantula; } @@ -100,7 +100,7 @@ @SpecAssertion(section = "4.1", id = "aa") public void testBindingDeclaredInheritedIsInherited() throws Exception { - Set<? extends Annotation> bindings = getCurrentManager().resolveByType(BorderCollie.class, new HairyBinding(false)).iterator().next().getBindings(); + Set<? extends Annotation> bindings = getCurrentManager().getBeans(BorderCollie.class, new HairyBinding(false)).iterator().next().getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Hairy.class); } @@ -109,7 +109,7 @@ @SpecAssertion(section = "4.1", id = "aa") public void testBindingNotDeclaredInheritedIsNotInherited() { - Set<? extends Annotation> bindings = getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getBindings(); + Set<? extends Annotation> bindings = getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Current.class); } @@ -118,7 +118,7 @@ @SpecAssertion(section = "4.1", id = "aa") public void testBindingDeclaredInheritedIsBlockedByIntermediateClass() { - Set<? extends Annotation> bindings = getCurrentManager().resolveByType(ClippedBorderCollie.class, new HairyBinding(true)).iterator().next().getBindings(); + Set<? extends Annotation> bindings = getCurrentManager().getBeans(ClippedBorderCollie.class, new HairyBinding(true)).iterator().next().getBindings(); assert bindings.size() == 1; Annotation binding = bindings.iterator().next(); assert binding.annotationType().equals(Hairy.class); @@ -130,7 +130,7 @@ @SpecAssertion(section = "4.1", id = "ag") public void testBindingDeclaredInheritedIsIndirectlyInherited() { - Set<? extends Annotation> bindings = getCurrentManager().resolveByType(EnglishBorderCollie.class, new HairyBinding(false)).iterator().next().getBindings(); + Set<? extends Annotation> bindings = getCurrentManager().getBeans(EnglishBorderCollie.class, new HairyBinding(false)).iterator().next().getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Hairy.class); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cat.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Chunky.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/ChunkyBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class ChunkyBinding extends AnnotationLiteral<Chunky> implements Chunky { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Cod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Hairy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/HairyBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; public class HairyBinding extends AnnotationLiteral<Hairy> implements Hairy { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; public class MockCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Order.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.Initializer; -import javax.inject.Production; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.deployment.Production; @Production class Order Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/OrderProcessor.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production public class OrderProcessor Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Produced.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Species.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class SpiderProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Synchronous.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/SynchronousBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class SynchronousBinding extends AnnotationLiteral<Synchronous> implements Synchronous { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/TameBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class TameBinding extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/Whitefish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/WhitefishBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class WhitefishBinding extends AnnotationLiteral<Whitefish> implements Whitefish { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -20,7 +20,7 @@ @SpecAssertion(section = "4.1", id = "ad") public void testBindingDeclaredInheritedIsInherited() throws Exception { - Set<? extends Annotation> bindings = getCurrentManager().resolveByType(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings(); + Set<? extends Annotation> bindings = getCurrentManager().getBeans(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Hairy.class); } @@ -29,7 +29,7 @@ @SpecAssertion(section = "4.1", id = "aj") public void testBindingDeclaredInheritedIsIndirectlyInherited() { - Set<? extends Annotation> bindings = getCurrentManager().resolveByType(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings(); + Set<? extends Annotation> bindings = getCurrentManager().getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Hairy.class); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairyBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.binding.enterprise; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; public class HairyBinding extends AnnotationLiteral<Hairy> implements Hairy { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,10 +5,10 @@ import java.util.Arrays; import java.util.List; -import javax.inject.DeploymentType; -import javax.inject.Production; -import javax.inject.UnsatisfiedDependencyException; -import javax.inject.manager.Bean; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -30,8 +30,8 @@ @SpecAssertion(section = "2.5.2", id = "a") public void testDeploymentTypeHasCorrectTarget() { - assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1; - Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next(); + assert getCurrentManager().getBeans(BlackWidow.class).size() == 1; + Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().getBeans(BlackWidow.class).iterator().next(); Target target = blackWidowSpiderModel.getScopeType().getAnnotation(Target.class); List<ElementType> elements = Arrays.asList(target.value()); @@ -48,8 +48,8 @@ @SpecAssertion(section = "2.5.2", id = "c") public void testDeploymentTypeDeclaresDeploymentTypeAnnotation() { - assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1; - Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next(); + assert getCurrentManager().getBeans(BlackWidow.class).size() == 1; + Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().getBeans(BlackWidow.class).iterator().next(); assert blackWidowSpiderModel.getDeploymentType().getAnnotation(DeploymentType.class) != null; } @@ -57,8 +57,8 @@ @SpecAssertion(section = "2.5.3", id = "c") public void testDeploymentTypeInheritedFromDeclaringBean() throws Exception { - assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1; - Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().resolveByType(BlackWidow.class).iterator().next(); + assert getCurrentManager().getBeans(BlackWidow.class).size() == 1; + Bean<BlackWidow> blackWidowSpiderModel = getCurrentManager().getBeans(BlackWidow.class).iterator().next(); assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); } @@ -66,8 +66,8 @@ @SpecAssertion(section = "2.5.5", id = "a") public void testDefaultDeploymentType() { - assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; - Bean<Tarantula> bean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + assert getCurrentManager().getBeans(Tarantula.class).size() == 1; + Bean<Tarantula> bean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); assert bean.getDeploymentType().equals(Production.class); } @@ -75,12 +75,12 @@ @SpecAssertion(section = "2.5.5", id = "b") public void testHighestPrecedenceDeploymentTypeFromStereotype() { - assert getCurrentManager().resolveByType(Rhinoceros.class).size() == 1; - Bean<?> bean = getCurrentManager().resolveByType(Rhinoceros.class).iterator().next(); + assert getCurrentManager().getBeans(Rhinoceros.class).size() == 1; + Bean<?> bean = getCurrentManager().getBeans(Rhinoceros.class).iterator().next(); assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); } - @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedDependencyException.class) + @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedResolutionException.class) @SpecAssertion(section = "2.5.6", id = "a") public void testBeanWithDisabledDeploymentTypeNotInstantiated() { @@ -94,8 +94,8 @@ }) public void testWebBeanDeploymentTypeOverridesStereotype() { - assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; - Bean<Reindeer> bean = getCurrentManager().resolveByType(Reindeer.class).iterator().next(); + assert getCurrentManager().getBeans(Reindeer.class).size() == 1; + Bean<Reindeer> bean = getCurrentManager().getBeans(Reindeer.class).iterator().next(); assert bean.getDeploymentType().equals(Production.class); } @@ -103,8 +103,8 @@ @SpecAssertion(section = "2.5.3", id = "i") public void testDeploymentTypeMayBeSpecifiedByStereotype() { - assert getCurrentManager().resolveByType(Goat.class).size() == 1; - Bean<Goat> bean = getCurrentManager().resolveByType(Goat.class).iterator().next(); + assert getCurrentManager().getBeans(Goat.class).size() == 1; + Bean<Goat> bean = getCurrentManager().getBeans(Goat.class).iterator().next(); assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); } @@ -112,48 +112,48 @@ @SpecAssertion(section = "4.1", id = "ca") public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception { - assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1; - assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(BorderCollie.class).size() == 1; + assert getCurrentManager().getBeans(BorderCollie.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test(groups = { "deploymentType" }) @SpecAssertion(section = "4.1", id = "ca") public void testDeploymentTypeNotDeclaredInheritedIsNotInherited() { - assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; - assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); + assert getCurrentManager().getBeans(ShetlandPony.class).size() == 1; + assert getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); } @Test(groups = { "deploymentType" }) @SpecAssertion(section = "4.1", id = "cc") public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeNotMarkedInherited() { - assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1; - assert getCurrentManager().resolveByType(GoldenRetriever.class).iterator().next().getDeploymentType().equals(Production.class); + assert getCurrentManager().getBeans(GoldenRetriever.class).size() == 1; + assert getCurrentManager().getBeans(GoldenRetriever.class).iterator().next().getDeploymentType().equals(Production.class); } @Test(groups = { "deploymentType" }) @SpecAssertion(section = "4.1", id = "cc") public void testDeploymentTypeDeclaredInheritedIsBlockedByIntermediateDeploymentTypeMarkedInherited() { - assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1; - assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class); + assert getCurrentManager().getBeans(GoldenLabrador.class).size() == 1; + assert getCurrentManager().getBeans(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class); } @Test @SpecAssertion(section = "4.1", id = "dab") public void testDeploymentTypeIsOverriddenByInheritedDeploymentType() { - assert getCurrentManager().resolveByType(Cow.class).size() == 1; - assert getCurrentManager().resolveByType(Cow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(Cow.class).size() == 1; + assert getCurrentManager().getBeans(Cow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section = "4.1", id = "dcb") public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType() { - assert getCurrentManager().resolveByType(JerseyCow.class).size() == 1; - assert getCurrentManager().resolveByType(JerseyCow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(JerseyCow.class).size() == 1; + assert getCurrentManager().getBeans(JerseyCow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DisabledDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/FishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedAnimalDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/HornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/InheritedDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/MammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/NotInheritedDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/RedSnapper.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Reindeer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @HornedMammalStereotype @Production Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.deployment; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/BeanWithInjectedField_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.broken.typevariable; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class BeanWithInjectedField_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/Farmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.broken.typevariable; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Farmer_Broken<T> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/BeanWithInjectedField_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.broken.wildcard; -import javax.inject.Current; +import javax.enterprise.inject.Current; class BeanWithInjectedField_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/Farmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.broken.wildcard; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Farmer_Broken<T> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.custom; -import javax.inject.Standard; +import javax.enterprise.inject.deployment.Standard; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/HornedAnimalDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.deployment.defaultDeploymentType; -import javax.inject.Production; -import javax.inject.Standard; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -19,31 +19,31 @@ @SpecAssertion(section = "4.1", id = "cb") public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception { - assert getCurrentManager().resolveByType(BorderCollieLocal.class, new WoofBinding()).size() == 1; - assert getCurrentManager().resolveByType(BorderCollieLocal.class, new WoofBinding()).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(BorderCollieLocal.class, new WoofBinding()).size() == 1; + assert getCurrentManager().getBeans(BorderCollieLocal.class, new WoofBinding()).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test(groups = { "deploymentType" }) @SpecAssertion(section = "4.1", id = "cd") public void testDeploymentTypeDeclaredInheritedIsIndirectlyInherited() throws Exception { - assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).size() == 1; - assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).size() == 1; + assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section = "4.1", id = "dbb") public void testDeploymentTypeIsOverriddenByInheritedDeploymentType() { - assert getCurrentManager().resolveByType(CowLocal.class).size() == 1; - assert getCurrentManager().resolveByType(CowLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(CowLocal.class).size() == 1; + assert getCurrentManager().getBeans(CowLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section = "4.1", id = "ddb") public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType() { - assert getCurrentManager().resolveByType(JerseyBullLocal.class).size() == 1; - assert getCurrentManager().resolveByType(JerseyBullLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(JerseyBullLocal.class).size() == 1; + assert getCurrentManager().getBeans(JerseyBullLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; public class WoofBinding extends AnnotationLiteral<Woof> implements Woof { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.deployment.nonBuiltInUsesStandard; -import javax.inject.Standard; +import javax.enterprise.inject.deployment.Standard; @Standard class Gazelle_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/FishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Haddock.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.name; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/Moose.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.name; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Named("aMoose") class Moose implements Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.name; +import javax.enterprise.inject.spi.Bean; import javax.inject.DefinitionException; -import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -33,8 +33,8 @@ }) public void testNonDefaultNamed() { - assert getCurrentManager().resolveByType(Moose.class).size() == 1; - Bean<Moose> moose =getCurrentManager().resolveByType(Moose.class).iterator().next(); + assert getCurrentManager().getBeans(Moose.class).size() == 1; + Bean<Moose> moose =getCurrentManager().getBeans(Moose.class).iterator().next(); assert moose.getName().equals("aMoose"); } @@ -46,8 +46,8 @@ }) public void testDefaultNamed() { - assert getCurrentManager().resolveByType(Haddock.class).size() == 1; - Bean<Haddock> haddock = getCurrentManager().resolveByType(Haddock.class).iterator().next(); + assert getCurrentManager().getBeans(Haddock.class).size() == 1; + Bean<Haddock> haddock = getCurrentManager().getBeans(Haddock.class).iterator().next(); assert haddock.getName() != null; assert haddock.getName().equals("haddock"); } @@ -60,8 +60,8 @@ }) public void testSterotypeDefaultsName() { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; - Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next(); + assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; + Bean<RedSnapper> bean = getCurrentManager().getBeans(RedSnapper.class).iterator().next(); assert bean.getName().equals("redSnapper"); } @@ -72,8 +72,8 @@ }) public void testNotNamedInJava() { - assert getCurrentManager().resolveByType(SeaBass.class).size() == 1; - Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next(); + assert getCurrentManager().getBeans(SeaBass.class).size() == 1; + Bean<SeaBass> bean = getCurrentManager().getBeans(SeaBass.class).iterator().next(); assert bean.getName() == null; } @@ -86,8 +86,8 @@ @Test @SpecAssertion(section="2.6.4", id = "a") public void testNotNamedInStereotype() { - assert getCurrentManager().resolveByType(Minnow.class).size() == 1; - Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next(); + assert getCurrentManager().getBeans(Minnow.class).size() == 1; + Bean<Minnow> bean = getCurrentManager().getBeans(Minnow.class).iterator().next(); assert bean.getName() == null; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RedSnapper.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.name; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/RiverFishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.name; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScope.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Dog.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Dog Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/FishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Minnow.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RiverFishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/NotInheritedScope.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Order.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Order Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Pollock.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @AnimalStereotype @FishStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RedSnapper.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Retriever.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class Retriever extends Dog Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/RiverFishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,11 +5,11 @@ import java.util.Arrays; import java.util.List; -import javax.context.ApplicationScoped; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.context.ScopeType; -import javax.inject.manager.Bean; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -29,8 +29,8 @@ @Test @SpecAssertion(section="2.4", id = "c") public void testScopeTypesAreExtensible() { - assert getCurrentManager().resolveByType(Mullet.class).size() == 1; - Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next(); + assert getCurrentManager().getBeans(Mullet.class).size() == 1; + Bean<Mullet> bean = getCurrentManager().getBeans(Mullet.class).iterator().next(); assert bean.getScopeType().equals(AnotherScopeType.class); } @@ -38,8 +38,8 @@ @SpecAssertion(section="2.4.2", id = "aa") public void testScopeTypeHasCorrectTarget() { - assert getCurrentManager().resolveByType(Mullet.class).size() == 1; - Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next(); + assert getCurrentManager().getBeans(Mullet.class).size() == 1; + Bean<Mullet> bean = getCurrentManager().getBeans(Mullet.class).iterator().next(); Target target = bean.getScopeType().getAnnotation(Target.class); List<ElementType> elements = Arrays.asList(target.value()); assert elements.contains(ElementType.TYPE); @@ -51,24 +51,24 @@ @SpecAssertion(section="2.4.2", id = "b") public void testScopeTypeDeclaresScopeTypeAnnotation() { - assert getCurrentManager().resolveByType(Mullet.class).size() == 1; - Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next(); + assert getCurrentManager().getBeans(Mullet.class).size() == 1; + Bean<Mullet> bean = getCurrentManager().getBeans(Mullet.class).iterator().next(); assert bean.getScopeType().getAnnotation(ScopeType.class) != null; } @Test @SpecAssertion(section="2.4.3", id = "a") public void testScopeDeclaredInJava() { - assert getCurrentManager().resolveByType(SeaBass.class).size() == 1; - Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next(); + assert getCurrentManager().getBeans(SeaBass.class).size() == 1; + Bean<SeaBass> bean = getCurrentManager().getBeans(SeaBass.class).iterator().next(); assert bean.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.4.5", id = "a") public void testDefaultScope() { - assert getCurrentManager().resolveByType(Order.class).size() == 1; - Bean<Order> bean = getCurrentManager().resolveByType(Order.class).iterator().next(); + assert getCurrentManager().getBeans(Order.class).size() == 1; + Bean<Order> bean = getCurrentManager().getBeans(Order.class).iterator().next(); assert bean.getScopeType().equals(Dependent.class); } @@ -79,24 +79,24 @@ }) public void testScopeSpecifiedAndStereotyped() { - assert getCurrentManager().resolveByType(Minnow.class).size() == 1; - Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next(); + assert getCurrentManager().getBeans(Minnow.class).size() == 1; + Bean<Minnow> bean = getCurrentManager().getBeans(Minnow.class).iterator().next(); assert bean.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.4.5", id = "d") public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() { - assert getCurrentManager().resolveByType(Pollock.class).size() == 1; - Bean<Pollock> bean = getCurrentManager().resolveByType(Pollock.class).iterator().next(); + assert getCurrentManager().getBeans(Pollock.class).size() == 1; + Bean<Pollock> bean = getCurrentManager().getBeans(Pollock.class).iterator().next(); assert bean.getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section="2.4.5", id = "c") public void testMutipleCompatibleScopeStereotypes() { - assert getCurrentManager().resolveByType(Grayling.class).size() == 1; - Bean<Grayling> bean = getCurrentManager().resolveByType(Grayling.class).iterator().next(); + assert getCurrentManager().getBeans(Grayling.class).size() == 1; + Bean<Grayling> bean = getCurrentManager().getBeans(Grayling.class).iterator().next(); assert bean.getScopeType().equals(ApplicationScoped.class); } @@ -107,42 +107,42 @@ }) public void testWebBeanScopeTypeOverridesStereotype() { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; - Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next(); + assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; + Bean<RedSnapper> bean = getCurrentManager().getBeans(RedSnapper.class).iterator().next(); assert bean.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="4.1", id = "ba") public void testScopeTypeDeclaredInheritedIsInherited() throws Exception { - assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="4.1", id = "ba") public void testScopeTypeNotDeclaredInheritedIsNotInherited() { - assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; - assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class); + assert getCurrentManager().getBeans(ShetlandPony.class).size() == 1; + assert getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section="4.1", id = "ba") public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeMarkedInherited() { - assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1; + assert getCurrentManager().getBeans(GoldenRetriever.class).size() == 1; } @Test @SpecAssertion(section="4.1", id = "ba") public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited() { - assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1; - assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class); + assert getCurrentManager().getBeans(GoldenLabrador.class).size() == 1; + assert getCurrentManager().getBeans(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section = "4.1", id = "bc") public void testScopeTypeDeclaredInheritedIsIndirectlyInherited() { - assert getCurrentManager().resolveByType(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/SeaBass.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.scope; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope.enterprise; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Dog Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.scope.enterprise; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -16,13 +16,13 @@ @Test @SpecAssertion(section="4.1", id = "bb") public void testScopeTypeDeclaredInheritedIsInherited() throws Exception { - assert getCurrentManager().resolveByType(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.1", id = "bd") public void testScopeTypeDeclaredInheritedIsIndirectlyInherited() { - assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.scope.tooMany; -import javax.context.ConversationScoped; -import javax.context.RequestScoped; +import javax.enterprise.context.ConversationScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped @ConversationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,8 +9,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnotherStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; @ApplicationScoped @Stereotype(supportedScopes=ApplicationScoped.class) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScopedAnimalStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @HornedMammalStereotype @RequestScopedAnimalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedAnimalDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @AnimalStereotype @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.definition.stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScopedHornedMammalStereotype @RequestScopedAnimalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,13 +2,13 @@ import java.lang.annotation.Annotation; -import javax.context.ApplicationScoped; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.context.SessionScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.manager.Bean; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -32,7 +32,7 @@ @SpecAssertion(section = "2.7.1", id = "b") public void testHasStereotypeAnnotation() { - Bean<Goat> bean = getCurrentManager().resolveByType(Goat.class).iterator().next(); + Bean<Goat> bean = getCurrentManager().getBeans(Goat.class).iterator().next(); assert !bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); } @@ -43,8 +43,8 @@ }) public void testStereotypeWithScopeType() { - assert getCurrentManager().resolveByType(Moose.class).size() == 1; - assert getCurrentManager().resolveByType(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(Moose.class).size() == 1; + assert getCurrentManager().getBeans(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @@ -54,15 +54,15 @@ }) public void testStereotypeWithoutScopeType() { - assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; - assert getCurrentManager().resolveByType(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class); + assert getCurrentManager().getBeans(Reindeer.class).size() == 1; + assert getCurrentManager().getBeans(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section = "2.7", id = "c") public void testOneStereotype() { - Bean<LongHairedDog> bean = getCurrentManager().resolveByType(LongHairedDog.class).iterator().next(); + Bean<LongHairedDog> bean = getCurrentManager().getBeans(LongHairedDog.class).iterator().next(); assert bean.getScopeType().equals(RequestScoped.class); } @@ -74,8 +74,8 @@ }) public void testMultipleStereotypes() { - assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; - Bean<HighlandCow> highlandCow = getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).size() == 1; + Bean<HighlandCow> highlandCow = getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).iterator().next(); assert highlandCow.getName() == null; assert highlandCow.getBindings().iterator().next().annotationType().equals(Tame.class); assert highlandCow.getScopeType().equals(RequestScoped.class); @@ -87,8 +87,8 @@ @SpecAssertion(section = "2.7.4", id = "c") }) public void testMultipleStereotypesMergesScopes() { - assert getCurrentManager().resolveByType(Springbok.class).size() == 1; - assert getCurrentManager().resolveByType(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class); + assert getCurrentManager().getBeans(Springbok.class).size() == 1; + assert getCurrentManager().getBeans(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class); } @Test @@ -96,8 +96,8 @@ @SpecAssertion(section = "2.7.4", id = "a") }) public void testRequiredTypeIsImplemented() { - assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class); + assert getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getBeans(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class); } @Test @@ -105,44 +105,44 @@ @SpecAssertion(section = "2.7.4", id = "b") }) public void testScopeIsSupported() { - assert getCurrentManager().resolveByType(Goldfish.class).size() == 1; - assert getCurrentManager().resolveByType(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(Goldfish.class).size() == 1; + assert getCurrentManager().getBeans(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.1", id = "ab") public void testStereotypeDeclaredInheritedIsInherited() throws Exception { - assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.1", id = "ab") public void testStereotypeNotDeclaredInheritedIsNotInherited() { - assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1; - assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); + assert getCurrentManager().getBeans(ShetlandPony.class).size() == 1; + assert getCurrentManager().getBeans(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class); } @Test @SpecAssertion(section = "4.1", id = "ah") public void testStereotypeDeclaredInheritedIsIndirectlyInherited() { - assert getCurrentManager().resolveByType(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.1", id = "daa") public void testStereotypeScopeIsOverriddenByInheritedScope() { - assert getCurrentManager().resolveByType(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); + assert getCurrentManager().getBeans(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); } @Test @SpecAssertion(section = "4.1", id = "dca") public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope() { - assert getCurrentManager().resolveByType(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); + assert getCurrentManager().getBeans(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,8 +9,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise; -import javax.context.RequestScoped; -import javax.context.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.SessionScoped; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -24,27 +24,27 @@ @SpecAssertion(section = "4.1", id = "ae") public void testStereotypeDeclaredInheritedIsInherited() throws Exception { - assert getCurrentManager().resolveByType(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.1", id = "ak") public void testStereotypeDeclaredInheritedIsIndirectlyInherited() { - assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.1", id = "dba") public void testStereotypeScopeIsOverriddenByInheritedScope() { - assert getCurrentManager().resolveByType(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); + assert getCurrentManager().getBeans(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); } @Test @SpecAssertion(section = "4.1", id = "dda") public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope() { - assert getCurrentManager().resolveByType(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); + assert getCurrentManager().getBeans(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; @AnimalStereotype @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; @ApplicationScoped @Stereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Stereotype; @Stereotype @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,8 +9,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/Bovine.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Mammal.class) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/HornedMammalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/RequestScopedStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.inject.Production; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.Production; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; -import javax.context.RequestScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DataAccessAuthorizationDecorator.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import javax.decorator.Decorates; import javax.decorator.Decorator; -import javax.inject.Current; +import javax.enterprise.inject.Current; @Decorator class DataAccessAuthorizationDecorator implements DataAccess Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -61,9 +61,9 @@ }) public void testOnlyEnabledBeansDeployed() { - assert !getCurrentManager().resolveByType(User.class).isEmpty(); - assert getCurrentManager().resolveByType(DisabledBean.class).isEmpty(); - assert getCurrentManager().resolveByType(Interceptor1.class).isEmpty(); - assert getCurrentManager().resolveByType(DataAccessAuthorizationDecorator.class).isEmpty(); + assert !getCurrentManager().getBeans(User.class).isEmpty(); + assert getCurrentManager().getBeans(DisabledBean.class).isEmpty(); + assert getCurrentManager().getBeans(Interceptor1.class).isEmpty(); + assert getCurrentManager().getBeans(DataAccessAuthorizationDecorator.class).isEmpty(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Initialized; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; -class InitializedBinding extends AnnotationLiteral<Initialized> implements Initialized +class InitializedBinding extends AnnotationLiteral<BeforeBeanDiscovery> implements BeforeBeanDiscovery { } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,11 +1,11 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle; -import javax.context.ApplicationScoped; -import javax.context.RequestScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.manager.Deployed; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class ManagerObserver { @@ -14,19 +14,19 @@ private static boolean requestContextActive = false; private static boolean applicationContextActive = false; - public void managerInitialized(@Observes @Initialized Manager manager) + public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { managerInitialized = true; - requestContextActive = manager.getContext(RequestScoped.class).isActive(); - applicationContextActive = manager.getContext(ApplicationScoped.class).isActive(); + requestContextActive = beanManager.getContext(RequestScoped.class).isActive(); + applicationContextActive = beanManager.getContext(ApplicationScoped.class).isActive(); } - public void managerDeployed(@Observes @Deployed Manager manager) + public void managerDeployed(@Observes @AfterBeanDiscovery BeanManager beanManager) { assert managerInitialized : "Manager should have been initialized before deployed"; managerDeployed = true; - requestContextActive &= manager.getContext(RequestScoped.class).isActive(); - applicationContextActive &= manager.getContext(ApplicationScoped.class).isActive(); + requestContextActive &= beanManager.getContext(RequestScoped.class).isActive(); + applicationContextActive &= beanManager.getContext(ApplicationScoped.class).isActive(); } public static boolean isManagerInitialized() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail; +import javax.enterprise.inject.Initializer; import javax.event.Observes; -import javax.inject.Initializer; class BrokenInitializerBean { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,12 +1,12 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class ManagerObserver { - public void managerInitialized(@Observes @Initialized Manager manager) + public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { assert false : "Deployment should already have failed"; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2; -import javax.inject.Current; +import javax.enterprise.inject.Current; class BeanWithInjection { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,20 +1,20 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.manager.Deployed; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class ManagerObserver { private static boolean managerInitialized; - public void managerInitialized(@Observes @Initialized Manager manager) + public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { managerInitialized = true; } - public void managerDeployed(@Observes @Deployed Manager manager) + public void managerDeployed(@Observes @AfterBeanDiscovery BeanManager beanManager) { assert false : "Manager should not be deployed due to deployment errors"; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,12 +1,12 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class ManagerObserver { - public void managerInitialized(@Observes @Initialized Manager manager) + public void managerInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { assert false : "This error should be turned into a DefinitionException"; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,12 +1,12 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Observes; -import javax.inject.manager.Deployed; -import javax.inject.manager.Manager; class ManagerObserver { - public void managerDeployed(@Observes @Deployed Manager manager) + public void managerDeployed(@Observes @AfterBeanDiscovery BeanManager beanManager) { assert false : "This error should result in a DeploymentException"; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype() @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,10 +2,10 @@ import java.util.Set; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; 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. @@ -13,11 +13,11 @@ */ class BananaSpider { - public void observeStringEvent(@Observes String someEvent, @Current Manager manager) + public void observeStringEvent(@Observes String someEvent, @Current BeanManager beanManager) { assert someEvent != null; - assert manager != null; - Set<Observer<String>> allStringObservers = manager.resolveObservers(someEvent); + assert beanManager != null; + Set<Observer<String>> allStringObservers = beanManager.resolveObservers(someEvent); assert allStringObservers != null; assert allStringObservers.size() > 0; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,7 +5,7 @@ import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { FIELD, PARAMETER }) @BindingType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,15 +4,15 @@ import java.util.ArrayList; import java.util.Set; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Event; import javax.event.Observer; -import javax.inject.AnnotationLiteral; import javax.inject.DuplicateBindingTypeException; -import javax.inject.Standard; -import javax.inject.TypeLiteral; -import javax.inject.manager.Bean; -import javax.inject.manager.Manager; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -150,7 +150,7 @@ @SpecAssertions( { @SpecAssertion(section = "7.2", id = "a") }) public void testManagerInterfaceForFireEventMethod() throws Exception { - assert Manager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null; + assert BeanManager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null; } @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @@ -564,7 +564,7 @@ { // Retrieve the implicit event bean from the manager only by // its API type - Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); + Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); assert !eventBeans.isEmpty(); } @@ -583,7 +583,7 @@ { // Retrieve the implicit event bean from the manager // by its binding types (uses OrangeCheekedWaxbill) - Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin")); + Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin")); assert !eventBeans.isEmpty(); } @@ -602,7 +602,7 @@ { // Retrieve the implicit event bean from the manager // only by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); + Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); assert eventBeans.size() == 1; Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); assert eventBean.getDeploymentType().equals(Standard.class); @@ -622,7 +622,7 @@ { // Retrieve the implicit event bean from the manager only // by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); + Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); assert eventBeans.size() == 1; Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); assert eventBean.getScopeType().equals(Dependent.class); @@ -641,7 +641,7 @@ { // Retrieve the implicit event bean from the manager only // by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); + Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); assert eventBeans.size() == 1; Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); assert eventBean.getName() == null; @@ -660,7 +660,7 @@ { // Retrieve the implicit event bean from the manager only // by its API type (uses BlueFacedParrotFinch) - Set<?> eventBeans = getCurrentManager().resolveByType(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); + Set<?> eventBeans = getCurrentManager().getBeans(new TypeLiteral<Event<AnEventType>>() {}, new FiresBinding()); assert eventBeans.size() == 1; } }.run(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FarmShop.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType class FarmShop extends Shop Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/FiresBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event; +import javax.enterprise.inject.AnnotationLiteral; 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/jsr299/tck/tests/event/Pomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event; -import javax.annotation.Named; +import javax.enterprise.inject.Named; import javax.event.Observes; @Named("Teddy") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; import javax.event.IfExists; import javax.event.Observes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Role.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { FIELD, PARAMETER }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class RoleBinding extends AnnotationLiteral<Role> implements Role Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spitz.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event; -import javax.annotation.Named; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; import javax.event.Observes; @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TeaCupPomeranian.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event; -import javax.annotation.Named; +import javax.enterprise.inject.Named; import javax.event.Observes; @Tame Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/JavaSparrow_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.event.broken.event4; +import javax.enterprise.inject.Produces; import javax.event.Event; import javax.event.Fires; -import javax.inject.Produces; class JavaSparrow_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TameAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.broken.observer10; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/TeaCupPomeranian.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.broken.observer10; -import javax.annotation.Named; +import javax.enterprise.inject.Named; import javax.event.Observes; @Tame Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer11/TeaCupPomeranian.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.broken.observer11; -import javax.annotation.Named; +import javax.enterprise.inject.Named; import javax.event.Observes; @Tame Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/Boxer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event.broken.observer2; -import javax.context.ConversationScoped; import javax.ejb.Stateless; +import javax.enterprise.context.ConversationScoped; @Stateless @ConversationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/YorkshireTerrier_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,13 +1,13 @@ package org.jboss.jsr299.tck.tests.event.broken.observer2; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class YorkshireTerrier_Broken { - public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager, @Observes Boxer anotherDog) { } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/BorderTerrier.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,14 +1,14 @@ package org.jboss.jsr299.tck.tests.event.broken.observer4; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Produces; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class BorderTerrier { @Produces - public String observeInitialized(@Observes @Initialized Manager manager) + public String observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { return "product"; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/AustralianTerrier.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.event.broken.observer5; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Initializer; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class AustralianTerrier { @@ -11,7 +11,7 @@ * @see org.jboss.jsr299.tck.unit.event.broken.observer5.Terrier#observeInitialized(javax.inject.manager.Manager) */ @Initializer - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/FoxTerrier.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,16 +1,16 @@ package org.jboss.jsr299.tck.tests.event.broken.observer6; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Disposes; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class FoxTerrier { /* (non-Javadoc) * @see org.jboss.jsr299.tck.unit.event.broken.observer6.Terrier#observeInitialized(javax.inject.manager.Manager, java.lang.String) */ - public void observeInitialized(@Observes @Initialized Manager manager, @Disposes String badParam) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager, @Disposes String badParam) { } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/AuroraFinch.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.event.register.fires1; +import javax.enterprise.inject.Initializer; import javax.event.Event; import javax.event.Fires; -import javax.inject.Initializer; import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BirdCage.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.event.register.fires1; -import javax.annotation.Named; -import javax.context.RequestScoped; -import javax.inject.Current; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/FinchKeeper.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event.register.fires1; -import javax.annotation.Named; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; import javax.event.Observes; import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyed.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OneEyedLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.fires1; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; public class OneEyedLiteral extends AnnotationLiteral<OneEyed> implements OneEyed { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/OrangeCheekedWaxbill.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.event.register.fires1; +import javax.enterprise.inject.Initializer; import javax.event.Event; import javax.event.Fires; -import javax.inject.Initializer; import org.jboss.jsr299.tck.tests.event.register.fires1.StarFinch.Mess; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/StarFinch.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.event.register.fires1; -import javax.annotation.Named; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; import javax.event.Event; import javax.event.Fires; -import javax.inject.Produces; @Named("StarFinch") public class StarFinch Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype() @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.observer1; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -20,8 +20,8 @@ import java.lang.annotation.Annotation; import java.util.Set; +import javax.enterprise.inject.TypeLiteral; import javax.event.Observer; -import javax.inject.TypeLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Role.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,7 +4,7 @@ import java.lang.annotation.Retention; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @BindingType @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/RoleBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.observer1; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class RoleBinding extends AnnotationLiteral<Role> implements Role Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/TameAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.observer1; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype() @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.observer2; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -20,8 +20,8 @@ import java.lang.annotation.Annotation; import java.util.Set; +import javax.enterprise.inject.TypeLiteral; import javax.event.Observer; -import javax.inject.TypeLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Role.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,7 +4,7 @@ import java.lang.annotation.Retention; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @BindingType @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/RoleBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.observer2; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class RoleBinding extends AnnotationLiteral<Role> implements Role Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/TameAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.register.observer2; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeA.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,5 +1,5 @@ package org.jboss.jsr299.tck.tests.event.resolve.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; public class BindingTypeABinding extends AnnotationLiteral<BindingTypeA> implements BindingTypeA {} \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeB.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,5 +1,5 @@ package org.jboss.jsr299.tck.tests.event.resolve.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; public class BindingTypeBBinding extends AnnotationLiteral<BindingTypeB> implements BindingTypeB {} \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeC.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.resolve.binding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; public class BindingTypeCBinding extends AnnotationLiteral<BindingTypeC> implements BindingTypeC { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype() @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.resolve.nonbinding; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.util.Set; +import javax.enterprise.inject.TypeLiteral; import javax.event.Observer; -import javax.inject.TypeLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.util.ArrayList; +import javax.enterprise.inject.TypeLiteral; import javax.event.Observer; -import javax.inject.TypeLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogAgent.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,14 +2,14 @@ import static javax.ejb.TransactionManagementType.BEAN; -import javax.annotation.Named; import javax.annotation.Resource; import javax.annotation.security.RunAs; import javax.ejb.EJBException; import javax.ejb.Stateless; import javax.ejb.TransactionManagement; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.spi.BeanManager; import javax.transaction.UserTransaction; @Stateless @@ -22,7 +22,7 @@ private UserTransaction userTransaction; @Current - private Manager jsr299Manager; + private BeanManager jsr299Manager; public void sendInTransaction(Object event) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -21,7 +21,7 @@ import java.math.BigInteger; import javax.ejb.EJBException; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,14 +6,14 @@ import java.math.BigInteger; import java.util.logging.Logger; -import javax.annotation.Named; import javax.annotation.Resource; -import javax.context.SessionScoped; import javax.ejb.EJBException; import javax.ejb.Remove; import javax.ejb.SessionContext; import javax.ejb.Stateful; import javax.ejb.TransactionManagement; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; import javax.event.AfterTransactionCompletion; import javax.event.AfterTransactionFailure; import javax.event.AfterTransactionSuccess; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.lang.annotation.Annotation; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -36,7 +36,7 @@ @Override protected void execute() throws Exception { - Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); + Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); Tarantula instance = getCurrentManager().getInstance(tarantula); tarantula.destroy(instance); } @@ -59,7 +59,7 @@ @Override protected void execute() throws Exception { - Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); + Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); Tarantula instance = getCurrentManager().getInstance(tarantula); tarantula.destroy(instance); } @@ -86,7 +86,7 @@ @Override protected void execute() throws Exception { - Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); + Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); Tarantula instance = getCurrentManager().getInstance(tarantula); tarantula.destroy(instance); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; -import javax.inject.Disposes; +import javax.enterprise.inject.Disposes; class DisposalNonBean { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; -import javax.inject.Current; -import javax.inject.Disposes; -import javax.inject.Produces; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1; -import javax.inject.Disposes; -import javax.inject.Produces; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2; -import javax.inject.Disposes; -import javax.inject.Produces; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; import javax.event.Observes; -import javax.inject.Disposes; -import javax.inject.Produces; @AnotherDeploymentType class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; -import javax.inject.Disposes; -import javax.inject.Produces; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; -import javax.inject.UnsatisfiedDependencyException; +import javax.enterprise.inject.UnsatisfiedResolutionException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -15,7 +15,7 @@ * */ @Artifact -(a)ExpectedDeploymentException(UnsatisfiedDependencyException.class) +(a)ExpectedDeploymentException(UnsatisfiedResolutionException.class) @BeansXml("beans.xml") public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/AppleTree.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6; import javax.ejb.Stateless; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @Stateless public class AppleTree implements AppleTreeLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.lang.annotation.Annotation; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -29,28 +29,28 @@ @SpecAssertion(section = "3.3", id = "b") public void testStatelessWithDependentScopeOK() { - assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; + assert getCurrentManager().getBeans(GiraffeLocal.class).size() == 1; } @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3", id = "c") public void testSingletonWithDependentScopeOK() { - assert getCurrentManager().resolveByType(Labrador.class).size() == 1; + assert getCurrentManager().getBeans(Labrador.class).size() == 1; } @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3", id = "c") public void testSingletonWithApplicationScopeOK() { - assert getCurrentManager().resolveByType(Laika.class).size() == 1; + assert getCurrentManager().getBeans(Laika.class).size() == 1; } @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3.2", id = "a") public void testAnnotatedEnterpriseBean() { - assert getCurrentManager().resolveByType(GiraffeLocal.class).size() > 0; + assert getCurrentManager().getBeans(GiraffeLocal.class).size() > 0; } @Test(groups = { "enterpriseBeans" }) @@ -60,7 +60,7 @@ @SpecAssertion(section = "3.3.4", id = "c") } ) public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() { - Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next(); + Bean<DogLocal> dogBean = getCurrentManager().getBeans(DogLocal.class).iterator().next(); assert dogBean.getTypes().contains(DogLocal.class); assert dogBean.getTypes().contains(PitbullLocal.class); assert !dogBean.getTypes().contains(Pitbull.class); @@ -76,7 +76,7 @@ public void testEnterpriseBeanWithLocalViewAndNotParameterizedTypeHasClassAndSuperclassesAsBeanTypes() { //TODO We need a 3.1 compliant container for this test - Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next(); + Bean<DogLocal> dogBean = getCurrentManager().getBeans(DogLocal.class).iterator().next(); assert dogBean.getTypes().contains(Pitbull.class); } @@ -88,15 +88,15 @@ }) public void testObjectIsInAPITypes() { - assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; - assert getCurrentManager().resolveByType(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class); + assert getCurrentManager().getBeans(GiraffeLocal.class).size() == 1; + assert getCurrentManager().getBeans(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class); } @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3.3", id = "d") public void testRemoteInterfacesAreNotInAPITypes() { - Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next(); + Bean<DogLocal> dogBean = getCurrentManager().getBeans(DogLocal.class).iterator().next(); assert !dogBean.getTypes().contains(DogRemote.class); } @@ -104,7 +104,7 @@ @SpecAssertion(section = "3.3.4", id = "ba") public void testBeanWithScopeAnnotation() { - Bean<LionLocal> lionBean = getCurrentManager().resolveByType(LionLocal.class).iterator().next(); + Bean<LionLocal> lionBean = getCurrentManager().getBeans(LionLocal.class).iterator().next(); assert lionBean.getScopeType().equals(RequestScoped.class); } @@ -112,7 +112,7 @@ @SpecAssertion(section = "3.3.4", id = "bb") public void testBeanWithNamedAnnotation() { - Bean<MonkeyLocal> monkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class).iterator().next(); + Bean<MonkeyLocal> monkeyBean = getCurrentManager().getBeans(MonkeyLocal.class).iterator().next(); assert monkeyBean.getName().equals("Monkey"); } @@ -120,7 +120,7 @@ @SpecAssertion(section = "3.3.4", id = "bc") public void testBeanWithDeploymentType() { - Bean<MonkeyLocal> monkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class).iterator().next(); + Bean<MonkeyLocal> monkeyBean = getCurrentManager().getBeans(MonkeyLocal.class).iterator().next(); assert monkeyBean.getDeploymentType().equals(AnotherDeploymentType.class); } @@ -128,7 +128,7 @@ @SpecAssertion(section = "3.3.4", id = "bd") public void testBeanWithStereotype() { - Bean<PolarBearLocal> polarBearBean = getCurrentManager().resolveByType(PolarBearLocal.class).iterator().next(); + Bean<PolarBearLocal> polarBearBean = getCurrentManager().getBeans(PolarBearLocal.class).iterator().next(); assert polarBearBean.getDeploymentType().equals(AnotherDeploymentType.class); assert polarBearBean.getScopeType().equals(RequestScoped.class); assert polarBearBean.getName().equals("polarBear"); @@ -139,7 +139,7 @@ public void testBeanWithBindings() { Annotation tame = new AnnotationLiteral<Tame>(){}; - Bean<ApeLocal> apeBean = getCurrentManager().resolveByType(ApeLocal.class, tame).iterator().next(); + Bean<ApeLocal> apeBean = getCurrentManager().getBeans(ApeLocal.class, tame).iterator().next(); assert apeBean.getBindings().contains(tame); } @@ -147,8 +147,8 @@ @SpecAssertion(section = "3.3.8", id = "a") public void testDefaultName() { - assert getCurrentManager().resolveByType(PitbullLocal.class).size() == 1; - assert getCurrentManager().resolveByType(PitbullLocal.class).iterator().next().getName().equals("pitbull"); + assert getCurrentManager().getBeans(PitbullLocal.class).size() == 1; + assert getCurrentManager().getBeans(PitbullLocal.class).iterator().next().getName().equals("pitbull"); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -48,7 +48,7 @@ }) public void testEjbDeclaredInXmlNotSimpleBean() { - Bean<ElephantLocal> elephantBean = getCurrentManager().resolveByType(ElephantLocal.class).iterator().next(); + Bean<ElephantLocal> elephantBean = getCurrentManager().getBeans(ElephantLocal.class).iterator().next(); // The interface is a known type but the class should not be assert elephantBean.getTypes().contains(ElephantLocal.class); assert !elephantBean.getTypes().contains(Elephant.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; -import javax.context.Dependent; import javax.ejb.Singleton; +import javax.enterprise.context.Dependent; @Singleton @Dependent Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; -import javax.context.ApplicationScoped; import javax.ejb.Remove; import javax.ejb.Singleton; +import javax.enterprise.context.ApplicationScoped; @Singleton @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Lion.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; -import javax.context.RequestScoped; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Monkey.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; -import javax.annotation.Named; import javax.ejb.Stateless; +import javax.enterprise.inject.Named; @Stateless @Named("Monkey") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; -import javax.annotation.Named; -import javax.context.ApplicationScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Named; @Stateful @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Polar.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,9 +8,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,10 +4,10 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Context; -import javax.context.CreationalContext; -import javax.context.RequestScoped; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -57,7 +57,7 @@ public void testCreateSFSB() throws Exception { GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); - Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next(); + Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>(); KleinStadt stadtInstance = stadtBean.create(creationalContext); @@ -91,7 +91,7 @@ public void testDestroyRemovesSFSB() throws Exception { GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); - Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next(); + Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; Context requestContext = getCurrentManager().getContext(RequestScoped.class); CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>(); @@ -122,7 +122,7 @@ @SpecAssertion(section = "6.6", id = "a") public void testCreateSLSB() { - Bean<NeueStadt> stadtBean = getCurrentManager().resolveByType(NeueStadt.class).iterator().next(); + Bean<NeueStadt> stadtBean = getCurrentManager().getBeans(NeueStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; CreationalContext<NeueStadt> creationalContext = new MockCreationalContext<NeueStadt>(); NeueStadt stadtInstance = stadtBean.create(creationalContext); @@ -158,7 +158,7 @@ { UniStadt marburg = getCurrentManager().getInstanceByType(UniStadt.class); assert marburg != null : "Couldn't find the main SFSB"; - Bean<UniStadt> uniStadtBean = getCurrentManager().resolveByType(UniStadt.class).iterator().next(); + Bean<UniStadt> uniStadtBean = getCurrentManager().getBeans(UniStadt.class).iterator().next(); uniStadtBean.destroy(marburg); GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); assert frankfurt.isSchlossDestroyed(); @@ -169,7 +169,7 @@ public void testDirectSubClassInheritsPostConstructOnSuperclass() throws Exception { OrderProcessor.postConstructCalled = false; - assert getCurrentManager().resolveByType(DirectOrderProcessorLocal.class).size() == 1; + assert getCurrentManager().getBeans(DirectOrderProcessorLocal.class).size() == 1; new RunInDependentContext() { @Override @@ -186,7 +186,7 @@ public void testIndirectSubClassInheritsPostConstructOnSuperclass() throws Exception { OrderProcessor.postConstructCalled = false; - assert getCurrentManager().resolveByType(OrderProcessorLocal.class).size() == 1; + assert getCurrentManager().getBeans(OrderProcessorLocal.class).size() == 1; new RunInDependentContext() { @Override @@ -203,13 +203,13 @@ public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception { OrderProcessor.preDestroyCalled = false; - assert getCurrentManager().resolveByType(DirectOrderProcessorLocal.class).size() == 1; + assert getCurrentManager().getBeans(DirectOrderProcessorLocal.class).size() == 1; new RunInDependentContext() { @Override protected void execute() throws Exception { - Bean<DirectOrderProcessorLocal> bean = getCurrentManager().resolveByType(DirectOrderProcessorLocal.class).iterator().next(); + Bean<DirectOrderProcessorLocal> bean = getCurrentManager().getBeans(DirectOrderProcessorLocal.class).iterator().next(); DirectOrderProcessorLocal instance = getCurrentManager().getInstanceByType(DirectOrderProcessorLocal.class); bean.destroy(instance); } @@ -222,13 +222,13 @@ public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception { OrderProcessor.preDestroyCalled = false; - assert getCurrentManager().resolveByType(IndirectOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1; new RunInDependentContext() { @Override protected void execute() throws Exception { - Bean<IndirectOrderProcessor> bean = getCurrentManager().resolveByType(IndirectOrderProcessor.class).iterator().next(); + Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next(); IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class); bean.destroy(instance); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,10 +2,10 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.context.RequestScoped; import javax.ejb.EJB; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; @Stateful @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,10 +1,10 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; import javax.annotation.PreDestroy; -import javax.context.Dependent; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; @Stateful @Dependent Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import javax.annotation.PostConstruct; import javax.ejb.Stateless; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; @Stateless public class Mainz implements AlteStadt Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.inject.Current; @Stateful public class Marburg implements UniStadt Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; public class MockCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding; -import javax.inject.Current; -import javax.inject.New; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.New; class NewAndOtherBindingType_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding; -import javax.annotation.Named; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,9 +8,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; -import javax.context.SessionScoped; import javax.ejb.Stateful; -import javax.inject.Disposes; -import javax.inject.Produces; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; -import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; import javax.event.Observes; @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.SessionScoped; import javax.ejb.Stateful; -import javax.inject.Initializer; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Named; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -92,7 +92,7 @@ { FoxLocal fox = getCurrentManager().getInstanceByType(FoxLocal.class); FoxLocal newFox = getCurrentManager().getInstanceByType(FoxLocal.class, new NewLiteral()); - Bean<Litter> litterBean = getCurrentManager().resolveByType(Litter.class).iterator().next(); + Bean<Litter> litterBean = getCurrentManager().getBeans(Litter.class).iterator().next(); Litter litter = getCurrentManager().getInstanceByType(Litter.class); litterBean.destroy(litter); assert fox.isLitterDisposed(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,13 +3,14 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; -import javax.inject.New; -import javax.inject.Standard; -import javax.inject.manager.Bean; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.New; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -37,7 +38,7 @@ @SpecAssertion(section = "3.3.6", id = "d") public void testNewBeanIsDependentScoped() { - Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral()); + Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral()); assert beans.size() == 1; newEnterpriseBean = beans.iterator().next(); assert Dependent.class.equals(newEnterpriseBean.getScopeType()); @@ -47,7 +48,7 @@ @SpecAssertion(section = "3.3.6", id = "e") public void testNewBeanIsOfStandardDeploymentType() { - Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral()); + Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral()); assert beans.size() == 1; newEnterpriseBean = beans.iterator().next(); assert Standard.class.equals(newEnterpriseBean.getDeploymentType()); @@ -57,7 +58,7 @@ @SpecAssertion(section = "3.3.6", id = "f") public void testNewBeanIsHasOnlyNewBinding() { - Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral()); + Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral()); assert beans.size() == 1; newEnterpriseBean = beans.iterator().next(); assert newEnterpriseBean.getBindings().size() == 1; @@ -68,7 +69,7 @@ @SpecAssertion(section = "3.3.6", id = "g") public void testNewBeanHasNoWebBeanName() { - Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral()); + Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral()); assert beans.size() == 1; newEnterpriseBean = beans.iterator().next(); assert newEnterpriseBean.getName() == null; @@ -78,8 +79,8 @@ @SpecAssertion(section = "3.3.6", id = "h") public void testNewBeanHasNoStereotypes() { - Bean<MonkeyLocal> monkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class).iterator().next(); - Bean<MonkeyLocal> newMonkeyBean = getCurrentManager().resolveByType(MonkeyLocal.class, new NewLiteral()).iterator().next(); + Bean<MonkeyLocal> monkeyBean = getCurrentManager().getBeans(MonkeyLocal.class).iterator().next(); + Bean<MonkeyLocal> newMonkeyBean = getCurrentManager().getBeans(MonkeyLocal.class, new NewLiteral()).iterator().next(); assert monkeyBean.getScopeType().equals(RequestScoped.class); assert newMonkeyBean.getScopeType().equals(Dependent.class); assert monkeyBean.getName().equals("monkey"); @@ -101,24 +102,24 @@ }) public void testForEachEnterpriseBeanANewBeanExists() { - Bean<OrderLocal> orderBean = getCurrentManager().resolveByType(OrderLocal.class).iterator().next(); - Bean<OrderLocal> newOrderBean = getCurrentManager().resolveByType(OrderLocal.class, new NewLiteral()).iterator().next(); + Bean<OrderLocal> orderBean = getCurrentManager().getBeans(OrderLocal.class).iterator().next(); + Bean<OrderLocal> newOrderBean = getCurrentManager().getBeans(OrderLocal.class, new NewLiteral()).iterator().next(); assert orderBean.getBindings().size() == 1; assert orderBean.getBindings().iterator().next().annotationType().equals(Current.class); - assert getCurrentManager().resolveByType(OrderLocal.class, new NewLiteral()).size() == 1; + assert getCurrentManager().getBeans(OrderLocal.class, new NewLiteral()).size() == 1; assert newOrderBean.getBindings().size() == 1; assert newOrderBean.getBindings().iterator().next().annotationType().equals(New.class); assert orderBean.getTypes().equals(newOrderBean.getTypes()); - Bean<LionLocal> lionBean = getCurrentManager().resolveByType(LionLocal.class, TAME_LITERAL).iterator().next(); - Bean<LionLocal> newLionBean = getCurrentManager().resolveByType(LionLocal.class, new NewLiteral()).iterator().next(); - assert getCurrentManager().resolveByType(LionLocal.class, TAME_LITERAL).size() == 1; + Bean<LionLocal> lionBean = getCurrentManager().getBeans(LionLocal.class, TAME_LITERAL).iterator().next(); + Bean<LionLocal> newLionBean = getCurrentManager().getBeans(LionLocal.class, new NewLiteral()).iterator().next(); + assert getCurrentManager().getBeans(LionLocal.class, TAME_LITERAL).size() == 1; assert lionBean.getBindings().size() == 1; assert lionBean.getBindings().iterator().next().annotationType().equals(Tame.class); - assert getCurrentManager().resolveByType(LionLocal.class, new NewLiteral()).size() == 1; + assert getCurrentManager().getBeans(LionLocal.class, new NewLiteral()).size() == 1; assert newLionBean.getBindings().size() == 1; assert newLionBean.getBindings().iterator().next().annotationType().equals(New.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Order.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean; -import javax.annotation.Named; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,7 +3,7 @@ import javax.annotation.PreDestroy; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.inject.Current; @Stateful public class DependentSessionBean implements DependentSessionInterface Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; -import javax.context.SessionScoped; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; @Stateful @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class StateKeeper Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithConversationScope; -import javax.context.ConversationScoped; +import javax.enterprise.context.ConversationScoped; //@Singleton Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithRequestScope; -import javax.context.RequestScoped; import javax.ejb.Singleton; +import javax.enterprise.context.RequestScoped; @Singleton @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; import javax.ejb.Singleton; +import javax.enterprise.context.SessionScoped; @Singleton @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope; -import javax.context.ApplicationScoped; import javax.ejb.Stateless; +import javax.enterprise.context.ApplicationScoped; @Stateless @ApplicationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope; -import javax.context.ConversationScoped; import javax.ejb.Stateless; +import javax.enterprise.context.ConversationScoped; @Stateless @ConversationScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope; -import javax.context.RequestScoped; import javax.ejb.Stateless; +import javax.enterprise.context.RequestScoped; @Stateless @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope; -import javax.context.SessionScoped; import javax.ejb.Stateless; +import javax.enterprise.context.SessionScoped; @Stateless @SessionScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/AndalusianChicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; import javax.ejb.Stateless; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; @Stateless public class AndalusianChicken implements LocalChicken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Chicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Chicken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenHutch.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class ChickenHutch { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Retention(RUNTIME) @Target({TYPE, METHOD, FIELD, PARAMETER}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class PremiumChickenHutch { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class StandardChickenHutch { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Retention(RUNTIME) @Target({TYPE, METHOD, FIELD, PARAMETER}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.methodAnnotatedProduces; -import javax.inject.Initializer; -import javax.inject.Produces; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; class Pheasant_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes; -import javax.inject.Disposes; -import javax.inject.Initializer; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; class Capercaillie_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/DangerCall.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class DangerCall Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves; +import javax.enterprise.inject.Initializer; import javax.event.Observes; -import javax.inject.Initializer; class Grouse_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/Dottrel_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Dottrel_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/AsAnimal.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; public class BlackWidowProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Chicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class Chicken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.Current; +import javax.enterprise.inject.Current; class FunnelWeaverSpiderConsumer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class FunnelWeaverSpiderProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/LadybirdSpider.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class LadybirdSpider extends Spider Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class OtherSpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -3,10 +3,11 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Production; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -34,7 +35,7 @@ @SpecAssertion(section = "2.5.3", id = "h") public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class); assert tarantulaBeans.size() == 1; assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @@ -63,9 +64,9 @@ }) public void testBeanDeclaresMultipleProducerFields() { - assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).size() == 1; assert getCurrentManager().getInstanceByType(Tarantula.class, TAME_LITERAL).equals(OtherSpiderProducer.TARANTULA) ; - assert getCurrentManager().resolveByType(BlackWidow.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getBeans(BlackWidow.class, TAME_LITERAL).size() == 1; assert getCurrentManager().getInstanceByType(BlackWidow.class, TAME_LITERAL).equals(OtherSpiderProducer.BLACK_WIDOW) ; } @@ -75,7 +76,7 @@ }) public void testDefaultBindingType() { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class); assert tarantulaBeans.size() == 1; assert tarantulaBeans.iterator().next().getBindings().contains(new CurrentLiteral()); } @@ -84,7 +85,7 @@ @SpecAssertion(section = "3.5.1", id = "c") public void testApiTypeForClassReturn() { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class); assert tarantulaBeans.size() == 1; Bean<Tarantula> tarantulaBean = tarantulaBeans.iterator().next(); assert tarantulaBean.getTypes().size() == 6; @@ -100,7 +101,7 @@ @SpecAssertion(section = "3.5.1", id = "a") public void testApiTypeForInterfaceReturn() { - Set<Bean<Animal>> animalBeans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<AsAnimal>() {}); + Set<Bean<Animal>> animalBeans = getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<AsAnimal>() {}); assert animalBeans.size() == 1; Bean<Animal> animalModel = animalBeans.iterator().next(); assert animalModel.getTypes().size() == 2; @@ -112,7 +113,7 @@ @SpecAssertion(section = "3.5.1", id = "b") public void testApiTypeForPrimitiveReturn() { - Set<Bean<?>> beans = getCurrentManager().resolveByName("SpiderSize"); + Set<Bean<?>> beans = getCurrentManager().getBeans("SpiderSize"); assert beans.size() == 1; Bean<?> intModel = beans.iterator().next(); assert intModel.getTypes().size() == 2; @@ -127,7 +128,7 @@ }) public void testApiTypeForArrayTypeReturn() { - Set<Bean<Spider[]>> spidersBeans = getCurrentManager().resolveByType(Spider[].class); + Set<Bean<Spider[]>> spidersBeans = getCurrentManager().getBeans(Spider[].class); assert spidersBeans.size() == 1; Bean<Spider[]> spidersModel = spidersBeans.iterator().next(); assert spidersModel.getTypes().size() == 2; @@ -142,7 +143,7 @@ }) public void testBindingType() { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, new TameAnnotationLiteral()); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, new TameAnnotationLiteral()); assert tarantulaBeans.size() == 1; Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); assert tarantulaModel.getBindings().size() == 1; @@ -153,7 +154,7 @@ @SpecAssertion(section = "3.5.2", id = "b") public void testScopeType() { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL); assert !tarantulaBeans.isEmpty(); Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); assert tarantulaModel.getScopeType().equals(RequestScoped.class); @@ -163,7 +164,7 @@ @SpecAssertion(section = "3.5.2", id = "d") public void testDeploymentType() { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL, FOO_LITERAL); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL, FOO_LITERAL); assert !tarantulaBeans.isEmpty(); Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); assert tarantulaModel.getDeploymentType().equals(Production.class); @@ -176,7 +177,7 @@ }) public void testNamedField() { - Set<Bean<?>> beans = getCurrentManager().resolveByName("blackWidow"); + Set<Bean<?>> beans = getCurrentManager().getBeans("blackWidow"); assert beans.size() == 1; @SuppressWarnings("unchecked") @@ -192,7 +193,7 @@ }) public void testDefaultNamedField() { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, STATIC_LITERAL); assert tarantulaBeans.size() == 1; Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); assert tarantulaModel.getName().equals("produceTarantula"); @@ -206,7 +207,7 @@ }) public void testStereotype() { - Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().resolveByType(Tarantula.class, STATIC_LITERAL); + Set<Bean<Tarantula>> tarantulaBeans = getCurrentManager().getBeans(Tarantula.class, STATIC_LITERAL); assert !tarantulaBeans.isEmpty(); Bean<Tarantula> tarantulaModel = tarantulaBeans.iterator().next(); assert tarantulaModel.getScopeType().equals(RequestScoped.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/SpiderStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -25,10 +25,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.Production; /** * Test stereotype used to change the scope type and deployment type Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Static.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.context.RequestScoped; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.Current; +import javax.enterprise.inject.Current; /** * This bean contains an injection point for a Tarantula that must be provided Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class TarantulaProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise; import javax.ejb.Stateful; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @Stateful public class Chicken implements ChickenLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/Foo.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class SpiderProducerWildCardType_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.inject.Current; +import javax.enterprise.inject.Current; /** * This simple bean contains an injection point to receive the value of a Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; @AnotherDeploymentType public class BlackWidowProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class BrownRecluseProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/HighestDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Null.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,8 +17,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; /** * Contains producer for Spider which always is a null value and Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,9 +17,9 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.annotation.Named; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; /** * Bean with a producer field that always returns null and is not Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.inject.IllegalProductException; +import javax.enterprise.inject.IllegalProductException; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,8 +17,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; /** * This bean contains a producer field and specializes another bean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -25,10 +25,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.Production; /** * Test stereotype used to change the scope type and deployment type Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class StaticTarantulaProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaConsumer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.inject.Current; +import javax.enterprise.inject.Current; /** * This bean contains an injection point for a Tarantula that must be provided Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/TarantulaProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType public class TarantulaProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/Working.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AndalusianChicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/AppleTree.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class AppleTree { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/BeanWithStaticProducerMethod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; -import javax.inject.Disposes; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production class BeanWithStaticProducerMethod Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Chicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class Chicken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/LadybirdSpider.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class LadybirdSpider extends Spider implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; -import javax.inject.Disposes; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production class NonBeanWithStaticProducerMethod Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class OakTree Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,12 +2,13 @@ import java.lang.annotation.Annotation; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; -import javax.inject.IllegalProductException; -import javax.inject.TypeLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.IllegalProductException; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -36,8 +37,8 @@ } ) public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { - assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test(groups = "producerMethod") @@ -48,7 +49,7 @@ } ) public void testStaticMethod() throws Exception { - assert getCurrentManager().resolveByType(String.class).size() == 1; + assert getCurrentManager().getBeans(String.class).size() == 1; assert getCurrentManager().getInstanceByType(String.class).equals(BeanWithStaticProducerMethod.getString()); } @@ -58,7 +59,7 @@ } ) public void testProducerOnNonBean() throws Exception { - assert getCurrentManager().resolveByType(Cherry.class).isEmpty(); + assert getCurrentManager().getBeans(Cherry.class).isEmpty(); } @Test(groups = "producerMethod") @@ -67,9 +68,9 @@ } ) public void testStaticDisposalMethod() throws Exception { - assert getCurrentManager().resolveByType(String.class).size() == 1; + assert getCurrentManager().getBeans(String.class).size() == 1; String aString = getCurrentManager().getInstanceByType(String.class); - Bean<String> stringBean = getCurrentManager().resolveByType(String.class).iterator().next(); + Bean<String> stringBean = getCurrentManager().getBeans(String.class).iterator().next(); stringBean.destroy(aString); assert BeanWithStaticProducerMethod.stringDestroyed; } @@ -78,7 +79,7 @@ @SpecAssertion(section = "3.4", id = "g") public void testParameterizedReturnType() throws Exception { - assert getCurrentManager().resolveByType(new TypeLiteral<FunnelWeaver<Spider>>() {}).size() == 1; + assert getCurrentManager().getBeans(new TypeLiteral<FunnelWeaver<Spider>>() {}).size() == 1; } @Test(groups = "producerMethod") @@ -89,9 +90,9 @@ }) public void testDefaultBindingType() throws Exception { - assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; - assert getCurrentManager().resolveByType(Tarantula.class).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Tarantula.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); + assert getCurrentManager().getBeans(Tarantula.class).size() == 1; + assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getBindings().size() == 1; + assert getCurrentManager().getBeans(Tarantula.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); } @Test(groups = "producerMethod") @@ -101,8 +102,8 @@ }) public void testApiTypeForClassReturn() throws Exception { - assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; - Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + assert getCurrentManager().getBeans(Tarantula.class).size() == 1; + Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class).iterator().next(); assert tarantula.getTypes().size() == 6; assert tarantula.getTypes().contains(Tarantula.class); @@ -117,8 +118,8 @@ @SpecAssertion(section = "3.4.1", id = "a") public void testApiTypeForInterfaceReturn() throws Exception { - assert getCurrentManager().resolveByType(Bite.class).size() == 1; - Bean<Bite> animal = getCurrentManager().resolveByType(Bite.class).iterator().next(); + assert getCurrentManager().getBeans(Bite.class).size() == 1; + Bean<Bite> animal = getCurrentManager().getBeans(Bite.class).iterator().next(); assert animal.getTypes().size() == 2; assert animal.getTypes().contains(Bite.class); assert animal.getTypes().contains(Object.class); @@ -128,8 +129,8 @@ @SpecAssertion(section = "3.4.1", id = "b") public void testApiTypeForPrimitiveReturn() throws Exception { - assert getCurrentManager().resolveByType(Integer.class).size() == 1; - Bean<Integer> integer = getCurrentManager().resolveByType(Integer.class).iterator().next(); + assert getCurrentManager().getBeans(Integer.class).size() == 1; + Bean<Integer> integer = getCurrentManager().getBeans(Integer.class).iterator().next(); assert integer.getTypes().size() == 2; assert integer.getTypes().contains(int.class); assert integer.getTypes().contains(Object.class); @@ -142,8 +143,8 @@ }) public void testApiTypeForArrayTypeReturn() throws Exception { - assert getCurrentManager().resolveByType(Spider[].class).size() == 1; - Bean<Spider[]> spiders = getCurrentManager().resolveByType(Spider[].class).iterator().next(); + assert getCurrentManager().getBeans(Spider[].class).size() == 1; + Bean<Spider[]> spiders = getCurrentManager().getBeans(Spider[].class).iterator().next(); assert spiders.getTypes().size() == 2; assert spiders.getTypes().contains(Spider[].class); assert spiders.getTypes().contains(Object.class); @@ -156,8 +157,8 @@ }) public void testBindingType() throws Exception { - assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; - Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).size() == 1; + Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, TAME_LITERAL).iterator().next(); assert tarantula.getBindings().size() == 1; assert tarantula.getBindings().iterator().next().annotationType().equals(Tame.class); } @@ -169,8 +170,8 @@ }) public void testScopeType() throws Exception { - assert getCurrentManager().resolveByType(DaddyLongLegs.class).size() == 1; - Bean<DaddyLongLegs> daddyLongLegs = getCurrentManager().resolveByType(DaddyLongLegs.class).iterator().next(); + assert getCurrentManager().getBeans(DaddyLongLegs.class).size() == 1; + Bean<DaddyLongLegs> daddyLongLegs = getCurrentManager().getBeans(DaddyLongLegs.class).iterator().next(); assert daddyLongLegs.getScopeType().equals(RequestScoped.class); } @@ -181,8 +182,8 @@ }) public void testDeploymentType() throws Exception { - assert getCurrentManager().resolveByType(LadybirdSpider.class).size() == 1; - Bean<LadybirdSpider> ladybirdSpider = getCurrentManager().resolveByType(LadybirdSpider.class).iterator().next(); + assert getCurrentManager().getBeans(LadybirdSpider.class).size() == 1; + Bean<LadybirdSpider> ladybirdSpider = getCurrentManager().getBeans(LadybirdSpider.class).iterator().next(); assert ladybirdSpider.getDeploymentType().equals(SpiderDeploymentType.class); } @@ -193,8 +194,8 @@ }) public void testNamedMethod() throws Exception { - assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1; - Bean<BlackWidow> blackWidowSpider = getCurrentManager().resolveByType(BlackWidow.class).iterator().next(); + assert getCurrentManager().getBeans(BlackWidow.class).size() == 1; + Bean<BlackWidow> blackWidowSpider = getCurrentManager().getBeans(BlackWidow.class).iterator().next(); assert blackWidowSpider.getName().equals("blackWidow"); } @@ -206,8 +207,8 @@ }) public void testDefaultNamedMethod() throws Exception { - assert getCurrentManager().resolveByType(DaddyLongLegs.class).size() == 1; - Bean<DaddyLongLegs> daddyLongLegsSpider = getCurrentManager().resolveByType(DaddyLongLegs.class).iterator().next(); + assert getCurrentManager().getBeans(DaddyLongLegs.class).size() == 1; + Bean<DaddyLongLegs> daddyLongLegsSpider = getCurrentManager().getBeans(DaddyLongLegs.class).iterator().next(); assert daddyLongLegsSpider.getName().equals("produceDaddyLongLegs"); } @@ -224,8 +225,8 @@ }) public void testStereotypeSpecifiesScope() throws Exception { - assert getCurrentManager().resolveByType(WolfSpider.class).size() == 1; - Bean<WolfSpider> wolfSpider = getCurrentManager().resolveByType(WolfSpider.class).iterator().next(); + assert getCurrentManager().getBeans(WolfSpider.class).size() == 1; + Bean<WolfSpider> wolfSpider = getCurrentManager().getBeans(WolfSpider.class).iterator().next(); assert wolfSpider.getScopeType().equals(RequestScoped.class); } @@ -233,7 +234,7 @@ @SpecAssertion(section = "4.2", id = "da") public void testNonStaticProducerMethodInheritedBySpecializingSubclass() { - assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1; + assert getCurrentManager().getBeans(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1; assert getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(AndalusianChicken.class); } @@ -244,7 +245,7 @@ }) public void testNonStaticProducerMethodNotInherited() { - assert getCurrentManager().resolveByType(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1; + assert getCurrentManager().getBeans(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1; assert getCurrentManager().getInstanceByType(Apple.class, new AnnotationLiteral<Yummy>() {}).getTree().getClass().equals(AppleTree.class); } @@ -252,7 +253,7 @@ @SpecAssertion(section = "2.3.6", id = "a") public void testBindingTypesAppliedToProducerMethodParameters() { - Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); + Bean<Tarantula> tarantula = getCurrentManager().getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); Tarantula instance = getCurrentManager().getInstance(tarantula); assert instance.getDeathsCaused() == 1; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition; -import javax.annotation.Named; -import javax.context.RequestScoped; -import javax.inject.Current; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Yummy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @AnotherDeploymentType @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise; import javax.ejb.Stateful; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @Stateful public class AppleTree implements AppleTreeLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise; import javax.ejb.Stateful; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @Stateful public class Chicken implements ChickenLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -22,7 +22,7 @@ @SpecAssertion(section = "4.2", id = "dd") public void testNonStaticProducerMethodInheritedBySpecializingSubclass() { - assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1; + assert getCurrentManager().getBeans(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1; assert getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(AndalusianChicken.class); } @@ -33,7 +33,7 @@ }) public void testNonStaticProducerMethodNotInherited() { - assert getCurrentManager().resolveByType(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1; + assert getCurrentManager().getBeans(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1; assert getCurrentManager().getInstanceByType(Apple.class, new AnnotationLiteral<Yummy>() {}).getTree().getClass().equals(AppleTree.class); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/FooProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.enterprise.nonbusiness; import javax.ejb.Stateful; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @Stateful public class FooProducer implements FooProducerLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Bakery.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class Bakery { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,15 +1,15 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Current; -import javax.inject.Produces; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.BeanManager; class BrownRecluse { @Produces - public SpiderEgg layAnEgg(@Current Manager manager) + public SpiderEgg layAnEgg(@Current BeanManager beanManager) { - assert manager != null : "Manager was not injected"; + assert beanManager != null : "Manager was not injected"; return new SpiderEgg(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Chicken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @PoultryFarmDeploymentType class Chicken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class Lays Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class LorryProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; public class MockCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Null.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.context.Dependent; -import javax.inject.IllegalProductException; -import javax.inject.manager.Bean; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.IllegalProductException; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -40,7 +40,7 @@ { SpiderProducer.setTarantulaDestroyed(false); Tarantula tarantula = getCurrentManager().getInstanceByType(Tarantula.class); - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); tarantulaBean.destroy(tarantula); assert SpiderProducer.isTarantulaDestroyed(); assert SpiderProducer.isDestroyArgumentsSet(); @@ -81,7 +81,7 @@ @Override protected void execute() throws Exception { - Bean<SpiderEgg> eggBean = getCurrentManager().resolveByType(SpiderEgg.class).iterator().next(); + Bean<SpiderEgg> eggBean = getCurrentManager().getBeans(SpiderEgg.class).iterator().next(); assert eggBean.create(new MockCreationalContext<SpiderEgg>()) != null; } @@ -103,7 +103,7 @@ protected void execute() throws Exception { Tarantula.setNumberCreated(0); - Bean<Tarantula> spiderBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> spiderBean = getCurrentManager().getBeans(Tarantula.class).iterator().next(); Tarantula tarantula = getCurrentManager().getInstance(spiderBean); assert tarantula.getValue().equals("Pete"); assert Tarantula.getNumberCreated() == 1; @@ -117,7 +117,7 @@ }) public void testCreateReturnsNullIfProducerDoesAndDependent() throws Exception { - Bean<Bread> breadBean = getCurrentManager().resolveByType(Bread.class).iterator().next(); + Bean<Bread> breadBean = getCurrentManager().getBeans(Bread.class).iterator().next(); assert breadBean.create(new MockCreationalContext<Bread>()) == null; } @@ -127,7 +127,7 @@ }) public void testCreateFailsIfProducerReturnsNullAndNotDependent() throws Exception { - Bean<PotatoChip> chipBean = getCurrentManager().resolveByType(PotatoChip.class).iterator().next(); + Bean<PotatoChip> chipBean = getCurrentManager().getBeans(PotatoChip.class).iterator().next(); assert chipBean.create(new MockCreationalContext<PotatoChip>()) == null; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Request.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class ShipProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Current; -import javax.inject.Disposes; -import javax.inject.Produces; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.BeanManager; @AnotherDeploymentType class SpiderProducer @@ -25,10 +25,10 @@ return null; } - public static void destroyTarantula(@Disposes Tarantula spider, @Current Manager manager) + public static void destroyTarantula(@Disposes Tarantula spider, @Current BeanManager beanManager) { tarantulaDestroyed = true; - if (manager != null) + if (beanManager != null) { destroyArgumentsSet = true; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducerNotUsed.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.inject.Disposes; -import javax.inject.Produces; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; public class SpiderProducerNotUsed { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.lifecycle; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedDisposes; -import javax.inject.Disposes; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; import javax.event.Observes; -import javax.inject.Produces; -import javax.inject.Production; @Production class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class SpiderProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter2; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; public class TProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class SpiderProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production class SpiderProducer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Animal.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production interface Animal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/ClovenHoved.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Cow_NotBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production abstract class Cow_NotBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Donkey.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Donkey Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEntity.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; import javax.persistence.Entity; import javax.persistence.Id; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/OuterClass.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; class OuterClass { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Sheep.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production class Sheep Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -24,7 +24,7 @@ }) public void testAbstractClassDeclaredInJavaNotDiscovered() { - assert getCurrentManager().resolveByType(Cow_NotBean.class).size() == 0; + assert getCurrentManager().getBeans(Cow_NotBean.class).size() == 0; } @Test(groups = "innerClass") @@ -34,7 +34,7 @@ }) public void testStaticInnerClassDeclaredInJavaAllowed() { - assert getCurrentManager().resolveByType(StaticInnerClass.class).size() == 1; + assert getCurrentManager().getBeans(StaticInnerClass.class).size() == 1; } @Test @@ -44,7 +44,7 @@ }) public void testNonStaticInnerClassDeclaredInJavaNotDiscovered() { - assert getCurrentManager().resolveByType(InnerClass_NotBeean.class).size() == 0; + assert getCurrentManager().getBeans(InnerClass_NotBeean.class).size() == 0; } @Test @@ -54,21 +54,21 @@ }) public void testParameterizedClassDeclaredInJavaIsNotDiscovered() { - assert getCurrentManager().resolveByType(ParameterizedClass_NotBean.class).size() == 0; + assert getCurrentManager().getBeans(ParameterizedClass_NotBean.class).size() == 0; } @Test @SpecAssertion(section = "3.2.1", id = "cb") public void testInterfaceNotDiscoveredAsSimpleBean() { - assert getCurrentManager().resolveByType(Animal.class).size() == 0; + assert getCurrentManager().getBeans(Animal.class).size() == 0; } @Test @SpecAssertion(section = "3.2.1", id = "e") public void testEntityClassesNotDiscoveredAsSimpleBean() { - assert getCurrentManager().resolveByType(MockEntity.class).size() == 0; + assert getCurrentManager().getBeans(MockEntity.class).size() == 0; } @Test @@ -80,41 +80,41 @@ @SpecAssertion(section = "3.2.1", id = "k")}) public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() { - assert getCurrentManager().resolveByType(MockFilter.class).size() == 0; - assert getCurrentManager().resolveByType(MockHttpSessionListener.class).size() == 0; - assert getCurrentManager().resolveByType(MockServlet.class).size() == 0; - assert getCurrentManager().resolveByType(MockServletContextListener.class).size() == 0; - assert getCurrentManager().resolveByType(MockServletRequestListener.class).size() == 0; + assert getCurrentManager().getBeans(MockFilter.class).size() == 0; + assert getCurrentManager().getBeans(MockHttpSessionListener.class).size() == 0; + assert getCurrentManager().getBeans(MockServlet.class).size() == 0; + assert getCurrentManager().getBeans(MockServletContextListener.class).size() == 0; + assert getCurrentManager().getBeans(MockServletRequestListener.class).size() == 0; } @Test @SpecAssertion(section="3.2.1", id="l") public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() { - assert getCurrentManager().resolveByType(MockEnterpriseBean.class).size() == 0; + assert getCurrentManager().getBeans(MockEnterpriseBean.class).size() == 0; } @Test @SpecAssertion(section="3.2.1", id="m") public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean() { - assert getCurrentManager().resolveByType(MockUIComponent.class).size() == 0; + assert getCurrentManager().getBeans(MockUIComponent.class).size() == 0; } @Test @SpecAssertion(section="3.2.1", id="p") public void testSimpleBeanOnlyIfConstructorParameterless() { - assert getCurrentManager().resolveByType(Antelope_NotBean.class).isEmpty(); - assert !getCurrentManager().resolveByType(Donkey.class).isEmpty(); + assert getCurrentManager().getBeans(Antelope_NotBean.class).isEmpty(); + assert !getCurrentManager().getBeans(Donkey.class).isEmpty(); } @Test @SpecAssertion(section="3.2.1", id="q") public void testSimpleBeanOnlyIfConstructorIsInitializer() { - assert getCurrentManager().resolveByType(Antelope_NotBean.class).isEmpty(); - assert !getCurrentManager().resolveByType(Sheep.class).isEmpty(); + assert getCurrentManager().getBeans(Antelope_NotBean.class).isEmpty(); + assert !getCurrentManager().getBeans(Sheep.class).isEmpty(); } @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedPackageTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -21,7 +21,7 @@ @SpecAssertion(section = "3.2.1", id = "o") public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean() { - assert getCurrentManager().resolveByType(Vet.class).size() == 0; + assert getCurrentManager().getBeans(Vet.class).size() == 0; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanOrmMappedTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -21,7 +21,7 @@ @SpecAssertion(section = "3.2.1", id = "o") public void testOrmMappedEntityClassesNotDiscoveredAsSimpleBean() { - assert getCurrentManager().resolveByType(Vet.class).size() == 0; + assert getCurrentManager().getBeans(Vet.class).size() == 0; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Tiger.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Tiger Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/Turkey.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production class Turkey Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter; -import javax.inject.Disposes; +import javax.enterprise.inject.Disposes; class DisposingConstructor_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Leopard_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; -import javax.inject.Initializer; -import javax.inject.Production; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.deployment.Production; @Production class Goose_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Cod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.annotation.PreDestroy; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Cod Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.Production; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Production; @Production Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/EggProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.inject.Disposes; -import javax.inject.Produces; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; public class EggProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Farm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,7 +4,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.inject.Current; +import javax.enterprise.inject.Current; class Farm { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishPond.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; import javax.annotation.PreDestroy; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; class FishPond { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/FishStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Goldfish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @RequestScopedAnimalStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MountainLion.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; class MyCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @FishStereotype @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,14 +2,14 @@ import java.lang.annotation.Annotation; -import javax.context.Context; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.CreationException; -import javax.inject.manager.Bean; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.CreationException; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -38,7 +38,7 @@ }) public void testInjectionOfParametersIntoBeanConstructor() { - assert getCurrentManager().resolveByType(FishPond.class).size() == 1; + assert getCurrentManager().getBeans(FishPond.class).size() == 1; FishPond fishPond = getCurrentManager().getInstanceByType(FishPond.class); assert fishPond.goldfish != null; } @@ -82,7 +82,7 @@ public void testCreateReturnsSameBeanPushed() throws Exception { final CreationalContext<Farm> farmCreationalContext = new MyCreationalContext<Farm>(); - final Contextual<Farm> farmBean = getCurrentManager().resolveByType(Farm.class).iterator().next(); + final Contextual<Farm> farmBean = getCurrentManager().getBeans(Farm.class).iterator().next(); MyCreationalContext.setLastBeanPushed(null); MyCreationalContext.setPushCalled(false); new RunInDependentContext() @@ -112,7 +112,7 @@ }) public void testCreateReturnsInstanceOfBean() { - assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; + assert getCurrentManager().getBeans(RedSnapper.class).size() == 1; assert getCurrentManager().getInstanceByType(RedSnapper.class) instanceof RedSnapper; } @@ -123,7 +123,7 @@ }) public void testCreateInjectsFieldsDeclaredInJava() { - assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1; + assert getCurrentManager().getBeans(TunaFarm.class).size() == 1; TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class); assert tunaFarm.tuna != null; } @@ -135,7 +135,7 @@ public void testContextCreatesNewInstanceForInjection() { Context requestContext = getCurrentManager().getContext(RequestScoped.class); - Bean<Tuna> tunaBean = getCurrentManager().resolveByType(Tuna.class).iterator().next(); + Bean<Tuna> tunaBean = getCurrentManager().getBeans(Tuna.class).iterator().next(); assert requestContext.get(tunaBean) == null; TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class); assert tunaFarm.tuna != null; @@ -149,8 +149,8 @@ }) public void testPostConstructPreDestroy() throws Exception { - assert getCurrentManager().resolveByType(Farm.class).size() == 1; - Bean<Farm> farmBean = getCurrentManager().resolveByType(Farm.class).iterator().next(); + assert getCurrentManager().getBeans(Farm.class).size() == 1; + Bean<Farm> farmBean = getCurrentManager().getBeans(Farm.class).iterator().next(); Farm farm = getCurrentManager().getInstanceByType(Farm.class); assert farm.founded != null; assert farm.initialStaff == 20; @@ -166,7 +166,7 @@ }) public void testContextualDestroyDisposesWhenNecessary() throws Exception { - final Contextual<Goose> gooseBean = getCurrentManager().resolveByType(Goose.class).iterator().next(); + final Contextual<Goose> gooseBean = getCurrentManager().getBeans(Goose.class).iterator().next(); final Goose goose = getCurrentManager().getInstanceByType(Goose.class); assert !EggProducer.isEggDisposed(); @@ -183,7 +183,7 @@ }) public void testContextualDestroyCatchesException() { - Bean<Cod> codBean = getCurrentManager().resolveByType(Cod.class).iterator().next(); + Bean<Cod> codBean = getCurrentManager().getBeans(Cod.class).iterator().next(); Cod codInstance = getCurrentManager().getInstanceByType(Cod.class); codBean.destroy(codInstance); } @@ -194,7 +194,7 @@ }) public void testDependentsDestroyedAfterPreDestroy() { - Bean<FishPond> pondBean = getCurrentManager().resolveByType(FishPond.class).iterator().next(); + Bean<FishPond> pondBean = getCurrentManager().getBeans(FishPond.class).iterator().next(); FishPond fishPond = getCurrentManager().getInstanceByType(FishPond.class); pondBean.destroy(fishPond); assert Salmon.isBeanDestroyed(); @@ -205,7 +205,7 @@ public void testSubClassInheritsPostConstructOnSuperclass() throws Exception { OrderProcessor.postConstructCalled = false; - assert getCurrentManager().resolveByType(CdOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(CdOrderProcessor.class).size() == 1; new RunInDependentContext() { @Override @@ -222,7 +222,7 @@ public void testIndirectSubClassInheritsPostConstructOnSuperclass() throws Exception { OrderProcessor.postConstructCalled = false; - assert getCurrentManager().resolveByType(IndirectOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1; new RunInDependentContext() { @Override @@ -239,13 +239,13 @@ public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception { OrderProcessor.preDestroyCalled = false; - assert getCurrentManager().resolveByType(CdOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(CdOrderProcessor.class).size() == 1; new RunInDependentContext() { @Override protected void execute() throws Exception { - Bean<CdOrderProcessor> bean = getCurrentManager().resolveByType(CdOrderProcessor.class).iterator().next(); + Bean<CdOrderProcessor> bean = getCurrentManager().getBeans(CdOrderProcessor.class).iterator().next(); CdOrderProcessor instance = getCurrentManager().getInstanceByType(CdOrderProcessor.class); bean.destroy(instance); } @@ -258,13 +258,13 @@ public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception { OrderProcessor.preDestroyCalled = false; - assert getCurrentManager().resolveByType(IndirectOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1; new RunInDependentContext() { @Override protected void execute() throws Exception { - Bean<IndirectOrderProcessor> bean = getCurrentManager().resolveByType(IndirectOrderProcessor.class).iterator().next(); + Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next(); IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class); bean.destroy(instance); } @@ -276,7 +276,7 @@ @SpecAssertion(section = "4.2", id = "baa") public void testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws Exception { - assert getCurrentManager().resolveByType(NovelOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(NovelOrderProcessor.class).size() == 1; OrderProcessor.postConstructCalled = false; new RunInDependentContext() { @@ -294,13 +294,13 @@ public void testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass() throws Exception { OrderProcessor.preDestroyCalled = false; - assert getCurrentManager().resolveByType(NovelOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(NovelOrderProcessor.class).size() == 1; new RunInDependentContext() { @Override protected void execute() throws Exception { - Bean<NovelOrderProcessor> bean = getCurrentManager().resolveByType(NovelOrderProcessor.class).iterator().next(); + Bean<NovelOrderProcessor> bean = getCurrentManager().getBeans(NovelOrderProcessor.class).iterator().next(); NovelOrderProcessor instance = getCurrentManager().getInstanceByType(NovelOrderProcessor.class); bean.destroy(instance); } @@ -313,7 +313,7 @@ @SpecAssertion(section = "6.2", id = "h") public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception { - assert getCurrentManager().resolveByType(Lorry_Broken.class).size() == 1; + assert getCurrentManager().getBeans(Lorry_Broken.class).size() == 1; new RunInDependentContext() { @@ -330,7 +330,7 @@ @SpecAssertion(section = "6.2", id = "g") public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception { - assert getCurrentManager().resolveByType(Van_Broken.class).size() == 1; + assert getCurrentManager().getBeans(Van_Broken.class).size() == 1; new RunInDependentContext() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Synchronous.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle; -import javax.inject.Current; -import javax.inject.Production; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.Production; @Production class TunaFarm Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,9 +9,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Named("Fred") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; import javax.event.Observes; -import javax.inject.Disposes; -import javax.inject.Produces; @AnimalStereotype class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Named; @SessionScoped @Named("Charlie") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,13 +5,14 @@ import java.lang.annotation.Target; import java.util.Set; -import javax.context.Dependent; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; -import javax.inject.New; -import javax.inject.Standard; -import javax.inject.manager.Bean; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.New; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -36,7 +37,7 @@ @SpecAssertion(section = "3.2.5", id = "d") public void testNewBeanIsDependentScoped() { - Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral()); + Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral()); assert beans.size() == 1; Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next(); assert Dependent.class.equals(newSimpleBean.getScopeType()); @@ -46,7 +47,7 @@ @SpecAssertion(section = "3.2.5", id = "e") public void testNewBeanIsOfStandardDeploymentType() { - Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral()); + Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral()); assert beans.size() == 1; Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next(); assert Standard.class.equals(newSimpleBean.getDeploymentType()); @@ -56,7 +57,7 @@ @SpecAssertion(section = "3.2.5", id = "f") public void testNewBeanHasOnlyNewBinding() { - Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral()); + Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral()); assert beans.size() == 1; Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next(); assert newSimpleBean.getBindings().size() == 1; @@ -67,7 +68,7 @@ @SpecAssertion(section = "3.2.5", id = "g") public void testNewBeanHasNoWebBeanName() { - Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().resolveByType(ExplicitContructorSimpleBean.class, new NewLiteral()); + Set<Bean<ExplicitContructorSimpleBean>> beans = getCurrentManager().getBeans(ExplicitContructorSimpleBean.class, new NewLiteral()); assert beans.size() == 1; Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next(); assert newSimpleBean.getName() == null; @@ -77,10 +78,10 @@ @SpecAssertion(section = "3.2.5", id = "h") public void testNewBeanHasNoStereotypes() { - Bean<Fox> foxBean = getCurrentManager().resolveByType(Fox.class).iterator().next(); + Bean<Fox> foxBean = getCurrentManager().getBeans(Fox.class).iterator().next(); assert foxBean.getScopeType().equals(RequestScoped.class); assert foxBean.getName().equals("fox"); - Bean<Fox> newFoxBean = getCurrentManager().resolveByType(Fox.class, new NewLiteral()).iterator().next(); + Bean<Fox> newFoxBean = getCurrentManager().getBeans(Fox.class, new NewLiteral()).iterator().next(); assert newFoxBean.getScopeType().equals(Dependent.class); assert newFoxBean.getName() == null; } @@ -147,7 +148,7 @@ { Fox fox = getCurrentManager().getInstanceByType(Fox.class); Fox newFox = getCurrentManager().getInstanceByType(Fox.class, new NewLiteral()); - Bean<Litter> litterBean = getCurrentManager().resolveByType(Litter.class).iterator().next(); + Bean<Litter> litterBean = getCurrentManager().getBeans(Litter.class).iterator().next(); Litter litter = getCurrentManager().getInstanceByType(Litter.class); litterBean.destroy(litter); assert fox.isLitterDisposed(); @@ -174,21 +175,21 @@ @SpecAssertion(section = "3.2.5", id = "a") public void testForEachSimpleBeanANewBeanExists() { - assert getCurrentManager().resolveByType(Order.class).size() == 1; - assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); + assert getCurrentManager().getBeans(Order.class).size() == 1; + assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().size() == 1; + assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).size() == 1; - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + assert getCurrentManager().getBeans(Order.class, new NewLiteral()).size() == 1; + assert getCurrentManager().getBeans(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert getCurrentManager().getBeans(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); + assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1; + assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class); - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).size() == 1; - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); + assert getCurrentManager().getBeans(Lion.class, new NewLiteral()).size() == 1; + assert getCurrentManager().getBeans(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1; + assert getCurrentManager().getBeans(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class); } @Test(groups = { "new" }) @@ -218,8 +219,8 @@ @SpecAssertion(section = "3.2.5", id = "bc") public void testNewBeanHasSameInjectedFields() { - Bean<InitializerSimpleBean> simpleBean = getCurrentManager().resolveByType(InitializerSimpleBean.class).iterator().next(); - Bean<InitializerSimpleBean> newSimpleBean = getCurrentManager().resolveByType(InitializerSimpleBean.class, new NewLiteral()).iterator().next(); + Bean<InitializerSimpleBean> simpleBean = getCurrentManager().getBeans(InitializerSimpleBean.class).iterator().next(); + Bean<InitializerSimpleBean> newSimpleBean = getCurrentManager().getBeans(InitializerSimpleBean.class, new NewLiteral()).iterator().next(); assert !newSimpleBean.getInjectionPoints().isEmpty(); assert simpleBean.getInjectionPoints().equals(newSimpleBean.getInjectionPoints()); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Order implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingType_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType; -import javax.inject.Current; -import javax.inject.New; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.New; class NewAndOtherBindingType_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/WrappedSimpleBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Named("Fred") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -49,7 +49,7 @@ @SpecAssertion(section = "6.4", id = "b") public void testInjectionOfEjbs() { - Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next(); SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); assert !simpleBean.isMyEjbExists() : "Ejb was injected too early"; assert simpleBean.getMyEjb() != null : "Ejb was not injected into bean"; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; class MyCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; class MyCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -37,7 +37,7 @@ }) public void testInjectionOfPersistenceContext() { - Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next(); SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); EntityManager entityManager = simpleBean.getPersistenceContext(); assert !simpleBean.isPersistenceContextExistsDuringConstruction() : "Persistence context injected too early"; @@ -49,7 +49,7 @@ public void testInjectionOfPersistenceUnit() { //TODO There is no spec assertion for this test and it does not work, but there is bean support for persistence units - Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next(); SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); EntityManagerFactory entityManagerFactory = simpleBean.getPersistenceUnit(); assert !simpleBean.isPersistenceUnitExistsDuringConstruction() : "Persistence unit injected too early"; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource; -import javax.inject.manager.Bean; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -22,11 +22,11 @@ @SpecAssertion(section = "6.4", id = "d") public void testInjectionOfResource() { - Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + Bean<SimpleBean> simpleBeanBean = getCurrentManager().getBeans(SimpleBean.class).iterator().next(); SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); - Manager manager = simpleBean.getManager(); + BeanManager beanManager = simpleBean.getManager(); assert !simpleBean.isManagerInjected() : "Manager injected too early"; - assert manager != null : "@Another Manager not found"; - assert manager.equals(getCurrentManager()): "Wrong manager found"; + assert beanManager != null : "@Another Manager not found"; + assert beanManager.equals(getCurrentManager()): "Wrong manager found"; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; class MyCreationalContext<T> implements CreationalContext<T> { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,22 +1,22 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource; import javax.annotation.Resource; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; class SimpleBean { @Resource - private Manager manager; + private BeanManager beanManager; private boolean managerInjected; public SimpleBean() { - managerInjected = manager != null; + managerInjected = beanManager != null; } - public Manager getManager() + public BeanManager getManager() { - return manager; + return beanManager; } public boolean isManagerInjected() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractCow.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.realization; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; abstract class AbstractCow { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractHorse.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.realization; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; abstract class AbstractHorse { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractKennel.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.realization; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class AbstractKennel Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AbstractStable.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.realization; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType abstract class AbstractStable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Cuddly.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/FarmAnimalDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/RealizationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.lang.annotation.Annotation; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -32,25 +32,25 @@ @SpecAssertion(section = "4.4.1", id = "ca") public void testRealizedBeanWithProducerMethodHasSameScope() { - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).size() == 1; + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.4.1", id = "ca") public void testRealizedBeanWithProducerMethodHasDeploymentTypeOfRealizingClass() { - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).size() == 1; + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section = "4.4.1", id = "ca") public void testRealizedBeanWithProducerMethodHasSameBindings() { - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).size() == 1; + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); } @SuppressWarnings("unchecked") @@ -58,42 +58,42 @@ @SpecAssertion(section = "4.4.1", id = "ca") public void testRealizedBeanWithProducerMethodHasBindingsOfMethodAndRealizingType() { - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches(getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; + assert getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches(getCurrentManager().getBeans(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); } @Test @SpecAssertion(section = "4.4.1", id = "ca") public void testRealizedBeanWithProducerMethodHasSameStereotypes() { - assert getCurrentManager().resolveByType(Dog.class).size() == 1; - assert getCurrentManager().resolveByType(Dog.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(Dog.class).size() == 1; + assert getCurrentManager().getBeans(Dog.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.4.1", id = "cb") public void testRealizedBeanWithProducerFieldHasSameScope() { - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).size() == 1; + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section = "4.4.1", id = "cb") public void testRealizedBeanWithProducerFieldHasDeploymentTypeOfRealizingClass() { - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).size() == 1; + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section = "4.4.1", id = "cb") public void testRealizedBeanWithProducerFieldHasSameBindings() { - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).size() == 1; + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); } @SuppressWarnings("unchecked") @@ -101,17 +101,17 @@ @SpecAssertion(section = "4.4.1", id = "cb") public void testRealizedBeanWithProducerFieldHasBindingsOfMethodAndRealizingType() { - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches(getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; + assert getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches(getCurrentManager().getBeans(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); } @Test @SpecAssertion(section = "4.4.1", id = "cb") public void testRealizedBeanWithProducerFieldHasSameStereotypes() { - assert getCurrentManager().resolveByType(Donkey.class).size() == 1; - assert getCurrentManager().resolveByType(Donkey.class).iterator().next().getScopeType().equals(RequestScoped.class); + assert getCurrentManager().getBeans(Donkey.class).size() == 1; + assert getCurrentManager().getBeans(Donkey.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test(groups = "stub") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Smelly.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/Tame.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Building.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @Stateful public class Building implements BuildingLocal Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -55,7 +55,7 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByType(Waste.class).size() == 1; + assert getCurrentManager().getBeans(Waste.class).size() == 1; assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import java.lang.annotation.Annotation; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import javax.inject.DefinitionException; -import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -34,11 +34,11 @@ }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; - Bean<FarmerLocal> bean = getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next(); - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches( getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); + assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; + Bean<FarmerLocal> bean = getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); + assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches( getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); } @Test @@ -48,9 +48,9 @@ }) public void testSpecializingBeanHasNameOfSpecializedBean() { - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); - assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); + assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1; + assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class); + assert getCurrentManager().getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); } @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Named("plough") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Farmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; -import javax.annotation.Named; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Landowner Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Landowner.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Lazy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @Lazy Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Office.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/Yard.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; -import javax.annotation.Named; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Named("backyard") @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Named("plough") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; -import javax.annotation.Named; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/Yard.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName; -import javax.annotation.Named; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Named("backyard") @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Farmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; -import javax.annotation.Named; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Landowner Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/Landowner.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; -import javax.annotation.Named; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Landowner Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean; import javax.ejb.Stateful; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType @Stateful Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Expensive.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/JewelryShop.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; class JewelryShop extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -29,9 +29,9 @@ }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { - assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches( getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class); + assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).size() == 1; + assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2; + assert annotationSetMatches( getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class); } @Test @@ -41,8 +41,8 @@ }) public void testSpecializingBeanHasNameOfSpecializedBean() { - assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1; - assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift"); + assert getCurrentManager().getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1; + assert getCurrentManager().getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift"); } @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Shop.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; class Shop Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/Sparkly.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Expensive.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; class ShoeShop_Broken extends MallShop { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/Shop.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; class Shop Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; class ClothesShop_Broken extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Expensive.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/Shop.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; class Shop Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; class FurnitureShop_Broken extends Shop Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; class Shop Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; -import javax.annotation.Named; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; class HighSchool_Broken extends School { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; class School { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; class Bookshop_Broken extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; -import javax.inject.Produces; -import javax.inject.Specializes; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.Specializes; class PictureShop_Broken extends Shop { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; class Shop Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Building.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class Building { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Farmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Landowner Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Landowner.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Lazy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/LazyFarmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @Lazy Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/Office.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.lang.annotation.Annotation; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -33,8 +33,8 @@ }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; - Bean<?> bean = getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).size() == 1; + Bean<?> bean = getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).iterator().next(); assert bean.getTypes().contains(LazyFarmer.class); assert bean.getBindings().size() == 2; assert annotationSetMatches(bean.getBindings(), Landowner.class, Lazy.class); @@ -47,9 +47,9 @@ }) public void testSpecializingBeanHasNameOfSpecializedBean() { - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); - assert "farmer".equals(getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName()); + assert getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).size() == 1; + assert getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); + assert "farmer".equals(getCurrentManager().getBeans(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName()); } @Test @@ -83,7 +83,7 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByType(Waste.class).size() == 1; + assert getCurrentManager().getBeans(Waste.class).size() == 1; assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; -import javax.annotation.Named; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Named("plough") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names; -import javax.annotation.Named; -import javax.inject.Specializes; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/Yard.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Named("backyard") class Yard Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Farmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Landowner @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/Landowner.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes class OrganicFarmer_Broken extends Farmer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Farmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Landowner Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/Landowner.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two; -import javax.inject.Specializes; +import javax.enterprise.inject.deployment.Specializes; @Specializes @AnotherDeploymentType class SheepFarmer_Broken extends Farmer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Chunky.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Cod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Haddock.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -36,7 +36,7 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByName("nonexistant").size() == 0; + assert getCurrentManager().getBeans("nonexistant").size() == 0; assert getCurrentManager().getInstanceByName("nonexistant") == null; assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Plaice.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.byname; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @AnotherDeploymentType @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -28,8 +28,8 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByName("whitefish").size() == 1; - assert getCurrentManager().resolveByName("whitefish").iterator().next().getTypes().contains(Plaice.class); + assert getCurrentManager().getBeans("whitefish").size() == 1; + assert getCurrentManager().getBeans("whitefish").iterator().next().getTypes().contains(Plaice.class); } }.run(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Salmon.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/SeaBass.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Sole.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.byname; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Whitefish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Cod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named("whitefish") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; -import javax.inject.AmbiguousDependencyException; +import javax.enterprise.inject.AmbiguousResolutionException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -38,7 +38,7 @@ * * @throws Exception */ - @Test(groups = { "resolution", "el" }, expectedExceptions = AmbiguousDependencyException.class) + @Test(groups = { "resolution", "el" }, expectedExceptions = AmbiguousResolutionException.class) @SpecAssertion(section = "5.10", id = "e") public void testDuplicateNamedBeans() throws Exception { @@ -48,7 +48,7 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByName("whitefish").size() == 2; + assert getCurrentManager().getBeans("whitefish").size() == 2; getCurrentManager().getInstanceByName("whitefish"); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/Sole.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.byname.duplicateNameResolution; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named("whitefish") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -36,7 +36,7 @@ @Override protected void execute() throws Exception { - Bean<Fox> foxBean = getCurrentManager().resolveByType(Fox.class).iterator().next(); + Bean<Fox> foxBean = getCurrentManager().getBeans(Fox.class).iterator().next(); Fox fox = getCurrentManager().getInstance(foxBean); assert !getCurrentConfiguration().getBeans().isProxy(fox); } @@ -60,7 +60,7 @@ @SpecAssertion(section = "5.4.2", id = "a") public void testClientProxyInvocation() { - Bean<TunedTuna> tunaBean = getCurrentManager().resolveByType(TunedTuna.class).iterator().next(); + Bean<TunedTuna> tunaBean = getCurrentManager().getBeans(TunedTuna.class).iterator().next(); TunedTuna tuna = getCurrentManager().getInstance(tunaBean); assert getCurrentConfiguration().getBeans().isProxy(tuna); assert tuna.getState().equals("tuned"); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/TunedTuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class TunedTuna Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.array; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; public class ArrayProducer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.array; -import javax.inject.UnproxyableDependencyException; +import javax.enterprise.inject.UnproxyableResolutionException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnproxyableDependencyException.class) +(a)ExpectedDeploymentException(UnproxyableResolutionException.class) public class ArrayTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/InjectionPointBean_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.array; -import javax.inject.Current; +import javax.enterprise.inject.Current; public class InjectionPointBean_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.finalmethod; -import javax.inject.UnproxyableDependencyException; +import javax.enterprise.inject.UnproxyableResolutionException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnproxyableDependencyException.class) +(a)ExpectedDeploymentException(UnproxyableResolutionException.class) public class FinalMethodTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/Tuna_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.finalmethod; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/InjectionPointBean_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; class InjectionPointBean_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor; -import javax.inject.UnproxyableDependencyException; +import javax.enterprise.inject.UnproxyableResolutionException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -10,7 +10,7 @@ @Artifact -(a)ExpectedDeploymentException(UnproxyableDependencyException.class) +(a)ExpectedDeploymentException(UnproxyableResolutionException.class) public class PrivateConstructorTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/Unproxyable_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped final class FinalTuna_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable; -import javax.inject.Current; +import javax.enterprise.inject.Current; public class FishFarm { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable; -import javax.inject.UnproxyableDependencyException; +import javax.enterprise.inject.UnproxyableResolutionException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(UnproxyableDependencyException.class) +(a)ExpectedDeploymentException(UnproxyableResolutionException.class) public class UnproxyableTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/BrokenInjectedBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.dependency.resolution; -import javax.inject.Current; +import javax.enterprise.inject.Current; class BrokenInjectedBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -7,11 +7,12 @@ import java.util.HashSet; import java.util.Set; -import javax.context.RequestScoped; -import javax.inject.UnproxyableDependencyException; -import javax.inject.UnsatisfiedDependencyException; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.UnproxyableResolutionException; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -26,7 +27,7 @@ { class MockInjectionPoint implements InjectionPoint { - private Bean<?> bean; + private Bean<?> beanWithManager; private Type type; private Member member; private Set<Annotation> bindings; @@ -34,7 +35,7 @@ public MockInjectionPoint(Bean<?> bean, Type type, Member member, Set<Annotation> bindings) { - this.bean = bean; + this.beanWithManager = bean; this.type = type; this.member = member; this.bindings = bindings; @@ -52,7 +53,7 @@ public Bean<?> getBean() { - return bean; + return beanWithManager; } public Set<Annotation> getBindings() @@ -83,48 +84,48 @@ }) public void testGetInstanceToInjectReturnsContextualInstance() throws Exception { - Bean<Vanilla> vanillaBean = getCurrentManager().resolveByType(Vanilla.class).iterator().next(); + Bean<Vanilla> vanillaBean = getCurrentManager().getBeans(Vanilla.class).iterator().next(); Field injectedField = InjectedBean.class.getField("vanilla"); Set<Annotation> bindings = new HashSet<Annotation>(); bindings.add(new CurrentLiteral()); MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings); - assert getCurrentManager().getInstanceToInject(injectionPoint) instanceof Vanilla; + assert getCurrentManager().getInjectableReference(injectionPoint, null) instanceof Vanilla; } - @Test(expectedExceptions = UnsatisfiedDependencyException.class) + @Test(expectedExceptions = UnsatisfiedResolutionException.class) @SpecAssertion(section = "5.7.1", id = "e") public void testGetInstanceToInjectThrowsUnsatisfiedDependencyException() throws Exception { - Bean<Vanilla> vanillaBean = getCurrentManager().resolveByType(Vanilla.class).iterator().next(); + Bean<Vanilla> vanillaBean = getCurrentManager().getBeans(Vanilla.class).iterator().next(); Field injectedField = InjectedBean.class.getField("vanilla"); Set<Annotation> bindings = new HashSet<Annotation>(); bindings.add(new OtherLiteral()); MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings); - assert getCurrentManager().getInstanceToInject(injectionPoint) instanceof Vanilla; + assert getCurrentManager().getInjectableReference(injectionPoint, null) instanceof Vanilla; } - @Test(expectedExceptions = UnsatisfiedDependencyException.class) + @Test(expectedExceptions = UnsatisfiedResolutionException.class) @SpecAssertion(section = "5.7.1", id = "f") public void testGetInstanceToInjectThrowsAmbiguousDependencyException() throws Exception { - Bean<Vanilla> vanillaBean = getCurrentManager().resolveByType(Vanilla.class).iterator().next(); + Bean<Vanilla> vanillaBean = getCurrentManager().getBeans(Vanilla.class).iterator().next(); Field injectedField = InjectedBean.class.getField("vanilla"); Set<Annotation> bindings = new HashSet<Annotation>(); bindings.add(new OtherLiteral()); MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings); - getCurrentManager().getInstanceToInject(injectionPoint); + getCurrentManager().getInjectableReference(injectionPoint, null); } - @Test(expectedExceptions=UnproxyableDependencyException.class) + @Test(expectedExceptions=UnproxyableResolutionException.class) @SpecAssertion(section = "5.7.1", id = "g") public void testGetInstanceToInjectThrowsUnproxyableDependencyException() throws Exception { - final Bean<Mustard> bean = getCurrentManager().resolveByType(Mustard.class).iterator().next(); + final Bean<Mustard> bean = getCurrentManager().getBeans(Mustard.class).iterator().next(); final Set<Annotation> bindings = new HashSet<Annotation>(); bindings.add(new OtherLiteral()); @@ -161,6 +162,6 @@ Field injectedField = BrokenInjectedBean.class.getField("mustard"); MockInjectionPoint injectionPoint = new MockInjectionPoint(bean, Mustard.class, injectedField, bindings); - getCurrentManager().getInstanceToInject(injectionPoint); + getCurrentManager().getInjectableReference(injectionPoint, null); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/InjectedBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.dependency.resolution; -import javax.inject.Current; +import javax.enterprise.inject.Current; class InjectedBean { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/Other.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/OtherLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.dependency.resolution; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class OtherLiteral extends AnnotationLiteral<Other> implements Other { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,9 +2,9 @@ import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE; +import javax.enterprise.inject.Instance; import javax.inject.DuplicateBindingTypeException; -import javax.inject.Instance; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -28,7 +28,7 @@ public void testObtainsInjectsInstanceOfInstance() { Bean<ObtainsInjectionPointBean> injectionPointBean = - getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next(); + getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next(); ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean); assert injectionPoint.getPaymentProcessor() instanceof Instance; @@ -43,7 +43,7 @@ public void testDynamicLookup() { Bean<ObtainsInjectionPointBean> injectionPointBean = - getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next(); + getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next(); ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean); assert injectionPoint.getPaymentProcessor().get() instanceof ChequePaymentProcessor; @@ -54,7 +54,7 @@ public void testDuplicateBindingsThrowsException() { Bean<ObtainsInjectionPointBean> injectionPointBean = - getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next(); + getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next(); ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean); injectionPoint.getPaymentProcessor().get(new PayByBinding() { public PaymentMethod value() { return CHEQUE; }}); @@ -65,7 +65,7 @@ public void testNonBindingThrowsException() { Bean<ObtainsInjectionPointBean> injectionPointBean = - getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next(); + getCurrentManager().getBeans(ObtainsInjectionPointBean.class).iterator().next(); ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean); injectionPoint.getPaymentProcessor().get(new NonBinding() ); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.dynamic; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class NonBinding extends AnnotationLiteral<NonBindingAnnotation> implements NonBindingAnnotation { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; class ObtainsInjectionPointBean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.dynamic; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; abstract class PayByBinding extends AnnotationLiteral<PayBy> implements PayBy { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.dynamic.notypeparam; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; class NoTypeParamBean_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.lookup.dynamic.typevariable; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.Produces; import javax.inject.Obtains; -import javax.inject.Produces; class TypeVariableBean_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.dynamic.wildcard; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; class WildcardBean_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.lookup.el; -import javax.context.Context; -import javax.context.Conversation; -import javax.context.RequestScoped; -import javax.inject.manager.Bean; +import javax.enterprise.context.Conversation; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -47,7 +47,7 @@ public void testContextCreatesNewInstanceForInjection() { Context requestContext = getCurrentManager().getContext(RequestScoped.class); - Bean<Tuna> tunaBean = getCurrentManager().resolveByType(Tuna.class).iterator().next(); + Bean<Tuna> tunaBean = getCurrentManager().getBeans(Tuna.class).iterator().next(); assert requestContext.get(tunaBean) == null; TunaFarm tunaFarm = getCurrentConfiguration().getEl().evaluateValueExpression("#{tunaFarm}", TunaFarm.class); assert tunaFarm.tuna != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.el; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/TunaFarm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.el; -import javax.annotation.Named; -import javax.inject.Current; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Named; @Named class TunaFarm Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent class Fox Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/FoxRun.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.inject.Current; +import javax.enterprise.inject.Current; class FoxRun { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/HenHouse.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.inject.Current; +import javax.enterprise.inject.Current; public class HenHouse { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.context.ContextNotActiveException; +import javax.enterprise.context.ContextNotActiveException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -22,7 +22,7 @@ @SpecAssertion(section = "5.2", id = "aa") public void testInjectionPerformsBoxingIfNecessary() throws Exception { - assert getCurrentManager().resolveByType(SpiderNest.class).size() == 1; + assert getCurrentManager().getBeans(SpiderNest.class).size() == 1; SpiderNest spiderNest = getCurrentManager().getInstanceByType(SpiderNest.class); assert spiderNest.numberOfSpiders != null; assert spiderNest.numberOfSpiders.equals(4); @@ -32,7 +32,7 @@ @SpecAssertion(section = "5.3", id = "a") public void testInvokeNormalInjectedWebBeanWhenContextNotActive() { - assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1; + assert getCurrentManager().getBeans(TunaFarm.class).size() == 1; TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class); assert tunaFarm.tuna != null; getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); @@ -43,7 +43,7 @@ @SpecAssertion(section = "5.3", id = "b") public void testInvokeDependentScopeWhenContextNotActive() { - assert getCurrentManager().resolveByType(FoxRun.class).size() == 1; + assert getCurrentManager().getBeans(FoxRun.class).size() == 1; FoxRun foxRun = getCurrentManager().getInstanceByType(FoxRun.class); assert foxRun.fox.getName().equals("gavin"); } @@ -84,7 +84,7 @@ @SpecAssertion(section = "3.8", id = "aa") public void testInjectingStaticField() { - assert getCurrentManager().resolveByType(BeanWithStaticBoundField_Broken.class).size() == 1; + assert getCurrentManager().getBeans(BeanWithStaticBoundField_Broken.class).size() == 1; assert getCurrentManager().getInstanceByType(BeanWithStaticBoundField_Broken.class).tuna == null; } @@ -92,7 +92,7 @@ @SpecAssertion(section = "3.8", id = "ab") public void testInjectingFinalField() { - assert getCurrentManager().resolveByType(BeanWithFinalBoundField_Broken.class).size() == 1; + assert getCurrentManager().getBeans(BeanWithFinalBoundField_Broken.class).size() == 1; assert getCurrentManager().getInstanceByType(BeanWithFinalBoundField_Broken.class).tuna == null; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderNest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class SpiderNest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/TunaFarm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.injection; -import javax.inject.Current; -import javax.inject.Production; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.Production; @Production class TunaFarm Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection.enterprise; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -28,7 +28,7 @@ @Override protected void execute() throws Exception { - Bean<HenHouseLocal> bean = getCurrentManager().resolveByType(HenHouseLocal.class).iterator().next(); + Bean<HenHouseLocal> bean = getCurrentManager().getBeans(HenHouseLocal.class).iterator().next(); HenHouseLocal henHouse = getCurrentManager().getInstance(bean); assert henHouse.getFox() != null; assert henHouse.getFox().getName().equals("gavin"); @@ -45,7 +45,7 @@ @Override protected void execute() throws Exception { - Bean<HenHouseLocal> bean = getCurrentManager().resolveByType(HenHouseLocal.class, new MegaPoorBinding()).iterator().next(); + Bean<HenHouseLocal> bean = getCurrentManager().getBeans(HenHouseLocal.class, new MegaPoorBinding()).iterator().next(); HenHouseLocal henHouse = getCurrentManager().getInstance(bean); assert henHouse.getFox() != null; assert henHouse.getFox().getName().equals("gavin"); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; @Dependent public class Fox implements Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection.enterprise; -import javax.inject.Current; +import javax.enterprise.inject.Current; class HenHouse { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoor.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorBinding.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection.enterprise; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class MegaPoorBinding extends AnnotationLiteral<MegaPoor> implements MegaPoor { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouseProducer_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class FarmHouseProducer_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/FarmHouse_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injection.nullableBean; -import javax.inject.Current; +import javax.enterprise.inject.Current; class FarmHouse_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.injectionpoint; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -16,8 +16,8 @@ */ package org.jboss.jsr299.tck.tests.lookup.injectionpoint; -import javax.inject.Current; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.InjectionPoint; /** * Test bean with injection point on the constructor of the bean Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -16,8 +16,8 @@ */ package org.jboss.jsr299.tck.tests.lookup.injectionpoint; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; /** * Test bean to inject a bean using injection point metadata into a constructor Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,8 +17,8 @@ package org.jboss.jsr299.tck.tests.lookup.injectionpoint; -import javax.context.RequestScoped; -import javax.inject.Current; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Current; /** * Test bean to inject another bean which uses injection point metadata in a Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -24,11 +24,11 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Dependent; -import javax.inject.Current; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -64,7 +64,7 @@ BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean(); assert beanWithInjectionPoint.getInjectedMetadata() != null; - Set<Bean<FieldInjectionPointBean>> resolvedBeans = getCurrentManager().resolveByType(FieldInjectionPointBean.class); + Set<Bean<FieldInjectionPointBean>> resolvedBeans = getCurrentManager().getBeans(FieldInjectionPointBean.class); assert resolvedBeans.size() == 1; assert beanWithInjectionPoint.getInjectedMetadata().getBean().equals(resolvedBeans.iterator().next()); } @@ -232,8 +232,8 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByType(InjectionPoint.class).size() == 1; - assert getCurrentManager().resolveByType(InjectionPoint.class).iterator().next().getDeploymentType().equals(Standard.class); + assert getCurrentManager().getBeans(InjectionPoint.class).size() == 1; + assert getCurrentManager().getBeans(InjectionPoint.class).iterator().next().getDeploymentType().equals(Standard.class); } }.run(); @@ -249,8 +249,8 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().resolveByType(InjectionPoint.class).size() == 1; - assert getCurrentManager().resolveByType(InjectionPoint.class).iterator().next().getScopeType().equals(Dependent.class); + assert getCurrentManager().getBeans(InjectionPoint.class).size() == 1; + assert getCurrentManager().getBeans(InjectionPoint.class).iterator().next().getScopeType().equals(Dependent.class); } }.run(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,8 +17,8 @@ package org.jboss.jsr299.tck.tests.lookup.injectionpoint; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; /** * Test bean to inject a bean using injection point metadata into a constructor Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/FishFarmOffice.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,11 +1,11 @@ package org.jboss.jsr299.tck.tests.lookup.manager; -import javax.inject.Current; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; class FishFarmOffice { - @Current public Manager manager; + @Current public BeanManager beanManager; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,10 +1,11 @@ package org.jboss.jsr299.tck.tests.lookup.manager; -import javax.context.Dependent; -import javax.inject.Current; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.Manager; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -31,7 +32,7 @@ protected void execute() throws Exception { FishFarmOffice fishFarmOffice = getCurrentManager().getInstanceByType(FishFarmOffice.class); - assert fishFarmOffice.manager != null; + assert fishFarmOffice.beanManager != null; } }.run(); @@ -41,31 +42,31 @@ @SpecAssertion(section = "5.7.2", id = "aa") public void testContainerProvidesManagerBean() { - assert getCurrentManager().resolveByType(Manager.class).size() > 0; + assert getCurrentManager().getBeans(BeanManager.class).size() > 0; } @Test @SpecAssertion(section = "5.7.2", id = "ab") public void testManagerBeanIsDependentScoped() { - Bean<Manager> manager = getCurrentManager().resolveByType(Manager.class).iterator().next(); - assert manager.getScopeType().equals(Dependent.class); + Bean<BeanManager> beanManager = getCurrentManager().getBeans(BeanManager.class).iterator().next(); + assert beanManager.getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section = "5.7.2", id = "ac") public void testManagerBeanHasStandardDeployment() { - Bean<Manager> manager = getCurrentManager().resolveByType(Manager.class).iterator().next(); - assert manager.getDeploymentType().equals(Standard.class); + Bean<BeanManager> beanManager = getCurrentManager().getBeans(BeanManager.class).iterator().next(); + assert beanManager.getDeploymentType().equals(Standard.class); } @Test @SpecAssertion(section = "5.7.2", id = "ad") public void testManagerBeanHasCurrentBinding() { - Bean<Manager> manager = getCurrentManager().resolveByType(Manager.class).iterator().next(); - assert manager.getBindings().iterator().next() instanceof Current; + Bean<BeanManager> beanManager = getCurrentManager().getBeans(BeanManager.class).iterator().next(); + assert beanManager.getBindings().iterator().next() instanceof Current; } @Test @@ -75,7 +76,7 @@ }) public void testGetInstanceReturnsContextualInstance() { - Bean<FishFarmOffice> bean = getCurrentManager().resolveByType(FishFarmOffice.class).iterator().next(); + Bean<FishFarmOffice> bean = getCurrentManager().getBeans(FishFarmOffice.class).iterator().next(); assert getCurrentManager().getInstance(bean) instanceof FishFarmOffice; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.manager.jndi; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import org.hibernate.tck.annotations.SpecAssertion; @@ -18,7 +18,7 @@ public void testManagerLookupInJndi() throws Exception { InitialContext ctx = new InitialContext(); - Manager manager = (Manager) ctx.lookup("java:app/Manager"); - assert manager != null; + BeanManager beanManager = (BeanManager) ctx.lookup("java:app/Manager"); + assert beanManager != null; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,7 +4,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.inject.Current; @Stateful public class Farm implements FarmLocal, Serializable Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -31,7 +31,7 @@ @SpecAssertion(section = "5.12.1", id = "a") public void testInjectionIntoSessionBeanInjectedViaEjb() throws Exception { - assert getCurrentManager().resolveByType(VillageLocal.class).size() == 1; + assert getCurrentManager().getBeans(VillageLocal.class).size() == 1; assert getCurrentManager().getInstanceByType(VillageLocal.class).getFarm().getBarn() != null; } @@ -40,7 +40,7 @@ public void testInjectionIntoSessionBeanInjectedViaResource() throws Exception { // Quite tough as no universal names. Need to allow these to be specified or something... - assert getCurrentManager().resolveByType(HamletLocal.class).size() == 1; + assert getCurrentManager().getBeans(HamletLocal.class).size() == 1; assert getCurrentManager().getInstanceByType(HamletLocal.class).getFarm().getBarn() != null; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/TestServlet.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.inject.Current; +import javax.enterprise.inject.Current; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Chunky.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Cod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/FakeFish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/InstantiationByTypeTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,10 +1,10 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; -import javax.inject.AmbiguousDependencyException; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.UnsatisfiedResolutionException; import javax.inject.DuplicateBindingTypeException; -import javax.inject.TypeLiteral; -import javax.inject.UnsatisfiedDependencyException; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -59,14 +59,14 @@ getCurrentManager().getInstanceByType(Tuna.class, new AnotherDeploymentTypeLiteral()); } - @Test(expectedExceptions=AmbiguousDependencyException.class) + @Test(expectedExceptions=AmbiguousResolutionException.class) @SpecAssertion(section="5.7.2", id = "n") public void testAmbiguousDependencies() throws Exception { getCurrentManager().getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){}); } - @Test(expectedExceptions=UnsatisfiedDependencyException.class) + @Test(expectedExceptions=UnsatisfiedResolutionException.class) @SpecAssertion(section="5.7.2", id = "m") public void testUnsatisfiedDependencies() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Salmon.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Sole.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.instantiation; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/Whitefish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; abstract class BindingTypeWithBindingAnnotationMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingAnnotationMember_Broken> implements BindingTypeWithBindingAnnotationMember_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; abstract class BindingTypeWithBindingArrayTypeMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingArrayTypeMember_Broken> implements BindingTypeWithBindingArrayTypeMember_Broken { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Chunky.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cod.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.NonBinding; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.NonBinding; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FakeFish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Farmer<T> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FishILike.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Haddock.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class LadybirdSpider extends Spider Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Plaice.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @AnotherDeploymentType @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -4,11 +4,12 @@ import java.util.List; import java.util.Set; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.spi.Bean; import javax.inject.DefinitionException; import javax.inject.DuplicateBindingTypeException; -import javax.inject.TypeLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -35,7 +36,7 @@ }) public void testDefaultBindingTypeAssumed() throws Exception { - Set<Bean<Tuna>> possibleTargets = getCurrentManager().resolveByType(Tuna.class); + Set<Bean<Tuna>> possibleTargets = getCurrentManager().getBeans(Tuna.class); assert possibleTargets.size() == 1; assert possibleTargets.iterator().next().getTypes().contains(Tuna.class); } @@ -44,28 +45,28 @@ @SpecAssertion(section="5.9", id = "cb") public void testParameterizedTypeWithWildcardParameter() { - getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){}); + getCurrentManager().getBeans(new TypeLiteral<ParameterizedBean_Broken<?>>(){}); } @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9", id = "ca") public <T> void testParameterizedTypeWithTypeParameter() { - getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); + getCurrentManager().getBeans(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); } @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9", id = "d") public void testDuplicateBindingTypesUsed() { - getCurrentManager().resolveByType(Tuna.class, new CurrentLiteral(), new CurrentLiteral()); + getCurrentManager().getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral()); } @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9", id = "e") public void testNonBindingTypeUsed() { - getCurrentManager().resolveByType(Tuna.class, new AnotherDeploymentTypeLiteral()); + getCurrentManager().getBeans(Tuna.class, new AnotherDeploymentTypeLiteral()); } @Test(groups="resolution") @@ -76,11 +77,11 @@ public void testResolveByType() throws Exception { - assert getCurrentManager().resolveByType(Tuna.class, new CurrentLiteral()).size() == 1; + assert getCurrentManager().getBeans(Tuna.class, new CurrentLiteral()).size() == 1; - assert getCurrentManager().resolveByType(Tuna.class).size() == 1; + assert getCurrentManager().getBeans(Tuna.class).size() == 1; - Set<Bean<Animal>> beans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<FishILike>() {}); + Set<Bean<Animal>> beans = getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<FishILike>() {}); assert beans.size() == 3; List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); for (Bean<Animal> bean : beans) @@ -112,7 +113,7 @@ }) public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() { - assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() { + assert getCurrentManager().getBeans(Animal.class, new ChunkyLiteral() { public boolean realChunky() { @@ -120,7 +121,7 @@ } }, new AnnotationLiteral<Whitefish>() {}).size() == 1; - assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() { + assert getCurrentManager().getBeans(Animal.class, new ChunkyLiteral() { public boolean realChunky() { @@ -129,9 +130,9 @@ }, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Cod.class); - assert getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2; + assert getCurrentManager().getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2; List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); - for (Bean<ScottishFish> bean : getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {})) + for (Bean<ScottishFish> bean : getCurrentManager().getBeans(ScottishFish.class, new AnnotationLiteral<Whitefish>() {})) { if (bean.getTypes().contains(Cod.class)) { @@ -154,22 +155,22 @@ }) public void testResolveByTypeWithTypeParameter() throws Exception { - assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1; - assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class); + assert getCurrentManager().getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1; + assert getCurrentManager().getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class); } @Test(groups={"resolution", "producerMethod"}) @SpecAssertion(section="5.9", id = "fc") public void testResolveByTypeWithArray() throws Exception { - assert getCurrentManager().resolveByType(Spider[].class).size() == 1; + assert getCurrentManager().getBeans(Spider[].class).size() == 1; } @Test @SpecAssertion(section="5.9", id = "ha") public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception { - assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1; - assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class); + assert getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1; + assert getCurrentManager().getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class); } @@ -178,7 +179,7 @@ @SpecAssertion(section="5.9", id = "hb") public void testNoWebBeansFound() throws Exception { - assert getCurrentManager().resolveByType(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0; + assert getCurrentManager().getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0; } @Test(groups="resolution") @@ -190,7 +191,7 @@ public void testResolveByTypeWithNonBindingMembers() throws Exception { - Set<Bean<Animal>> beans = getCurrentManager().resolveByType(Animal.class, new ExpensiveLiteral() + Set<Bean<Animal>> beans = getCurrentManager().getBeans(Animal.class, new ExpensiveLiteral() { public int cost() @@ -226,7 +227,7 @@ @SpecAssertion(section="5.9.1", id = "ca") public void testArrayValuedAnnotationMemberWithoutNonBinding() { - getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() { + getCurrentManager().getBeans(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() { public boolean[] bool() { @@ -240,7 +241,7 @@ @SpecAssertion(section="5.9.1", id = "cb") public void testAnnotationValuedAnnotationMemberWithoutNonBinding() { - getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken() + getCurrentManager().getBeans(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken() { public Expensive expensive() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Salmon.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class ScottishFishFarmer extends Farmer<ScottishFish> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SeaBass.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Sole.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/SpiderProducer.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; @AnotherDeploymentType class SpiderProducer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Tuna.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @AnotherDeploymentType @RequestScoped Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Whitefish.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.xml.annotationtypes; -import javax.context.RequestScoped; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -23,7 +23,7 @@ public void testBindingTypeFromXML() { //TODO The binding type appears as a non-binding annotation in the call to resolveByType() - assert getCurrentManager().resolveByType(BeanWithBinding.class, new AnnotationLiteral<TestBindingType>(){}).size() > 0; + assert getCurrentManager().getBeans(BeanWithBinding.class, new AnnotationLiteral<TestBindingType>(){}).size() > 0; } @Test(groups = { "ri-broken", "xml" }) @@ -52,7 +52,7 @@ public void testStereotypeFromXML() { //TODO The stereotype is not being applied to this bean - Bean<BeanWithStereotype> bean = getCurrentManager().resolveByType(BeanWithStereotype.class).iterator().next(); + Bean<BeanWithStereotype> bean = getCurrentManager().getBeans(BeanWithStereotype.class).iterator().next(); assert TestScopeType.class.isAssignableFrom(bean.getScopeType()); assert TestDeploymentType.class.isAssignableFrom(bean.getDeploymentType()); assert bean.getName() != null : "No default name for bean"; @@ -96,7 +96,7 @@ public void testStereotypeAnnotationOverridenByXML() { //TODO The stereotype is not being applied to this bean - Bean<BeanWithAnotherStereotype> bean = getCurrentManager().resolveByType(BeanWithAnotherStereotype.class).iterator().next(); + Bean<BeanWithAnotherStereotype> bean = getCurrentManager().getBeans(BeanWithAnotherStereotype.class).iterator().next(); assert RequestScoped.class.isAssignableFrom(bean.getScopeType()); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestBindingType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Retention(RUNTIME) @Target({TYPE, METHOD, FIELD, PARAMETER}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnotherTestStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Retention(RUNTIME) @Target(TYPE) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.xml.annotationtypes; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @DeploymentType public @interface TestDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestNamed.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.xml.annotationtypes; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Named public @interface TestNamed Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestScopeType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.xml.annotationtypes; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @ScopeType public @interface TestScopeType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Retention(RUNTIME) @Target(TYPE) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.util.Set; -import javax.inject.manager.Bean; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -28,8 +28,8 @@ }) public void testDeploymentDeclaration() { - Manager manager = getCurrentManager(); - Set<Bean<Order>> beans = manager.resolveByType(Order.class); + BeanManager beanManager = getCurrentManager(); + Set<Bean<Order>> beans = beanManager.getBeans(Order.class); assert !beans.isEmpty() : "There are no registered beans of type '" + Order.class + "'"; assert beans.iterator().next().getDeploymentType().equals(TestDeploymentType.class) : "Deployment type of bean '" + Order.class.getName() + "' is not '" + TestDeploymentType.class.getName() + "'"; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/TestDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -35,7 +35,7 @@ }) public void testXmlBasedMetadata() { - assert getCurrentManager().resolveByType(Order.class).size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'"; - assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1 : "There is no one or more than one registered beans with type '" + AnotherOrder.class + "'"; + assert getCurrentManager().getBeans(Order.class).size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'"; + assert getCurrentManager().getBeans(AnotherOrder.class).size() == 1 : "There is no one or more than one registered beans with type '" + AnotherOrder.class + "'"; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -30,7 +30,7 @@ }) public void testNamespaceAggregation() { - assert getCurrentManager().resolveByType(Cow.class).size() == 1; + assert getCurrentManager().getBeans(Cow.class).size() == 1; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/TestDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.xml.namespace.aggregation.foo; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @DeploymentType public @interface TestDeploymentType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/foo/copy/AnotherDeploymentType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -31,7 +31,7 @@ }) public void testNamespaceAggregation() { - assert getCurrentManager().resolveByType(Cow.class).size() == 1; + assert getCurrentManager().getBeans(Cow.class).size() == 1; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,12 +5,12 @@ import java.util.Date; import java.util.Set; -import javax.context.RequestScoped; import javax.ejb.TimerHandle; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; import javax.event.Event; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; -import javax.inject.manager.Manager; import javax.interceptor.InvocationContext; import javax.persistence.EntityManager; import javax.sql.DataSource; @@ -39,8 +39,8 @@ }) public void testJavaEePkg() { - Manager manager = getCurrentManager(); - Set<Bean<Order>> beans = manager.resolveByType(Order.class, bindings); + BeanManager beanManager = getCurrentManager(); + Set<Bean<Order>> beans = beanManager.getBeans(Order.class, bindings); assert beans.size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,8 +2,8 @@ import java.util.Date; -import javax.context.RequestScoped; import javax.ejb.TimerHandle; +import javax.enterprise.context.RequestScoped; import javax.event.Event; import javax.interceptor.InvocationContext; import javax.persistence.EntityManager; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerAddress.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/CurrentCustomerName.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PrimitiveTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -17,7 +17,7 @@ package org.jboss.jsr299.tck.tests.xml.namespace.javatypes; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javatypes/PurchaseOrder.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -2,7 +2,7 @@ import java.util.ArrayList; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class PurchaseOrder Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.xml.resource.resource; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Manager; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.BeanManager; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -29,8 +29,8 @@ }) public void testXMLDeclarationOfResource() { - Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {}); - assert manager != null : "@Another Manager not found"; - assert manager.equals(getCurrentManager()): "Wrong manager found"; + BeanManager beanManager = getCurrentManager().getInstanceByType(BeanManager.class, new AnnotationLiteral<Another>() {}); + assert beanManager != null : "@Another Manager not found"; + assert beanManager.equals(getCurrentManager()): "Wrong manager found"; } } Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:app="urn:java:org.jboss.jsr299.tck.tests.implementation.simple.resource.resource" - xmlns:m="urn:java:javax.inject.manager"> + xmlns:m="urn:java:javax.enterprise.inject.spi"> <m:Manager> <Resource> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes" - xmlns:manager="urn:java:javax.inject.manager"> + xmlns:manager="urn:java:javax.enterprise.inject.spi"> <dd:TestBindingType> <BindingType /> </dd:TestBindingType> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml 2009-05-26 12:53:17 UTC (rev 2712) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:app="urn:java:org.jboss.jsr299.tck.tests.xml.resource.resource" - xmlns:m="urn:java:javax.inject.manager"> + xmlns:m="urn:java:javax.enterprise.inject.spi"> <m:Manager> <Resource> Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-05-26 12:53:17 UTC (rev 2712) @@ -2345,11 +2345,11 @@ <section id="5.6" title="Injection point metadata"> <assertion id="a"> - <text>The |javax.inject.manager.InjectionPoint.getBean()| method returns the Bean object representing the bean that defines the injection point</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getBean()| method returns the Bean object representing the bean that defines the injection point</text> </assertion> <assertion id="ba"> - <text>The |javax.inject.manager.InjectionPoint.getType()| method returns the declared type of the injection point.</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getType()| method returns the declared type of the injection point.</text> </assertion> <assertion id="bb"> @@ -2357,43 +2357,43 @@ </assertion> <assertion id="bc"> - <text>The |javax.inject.manager.InjectionPoint.getBindings()| method returns the declared bindings of the injection point.</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getBindings()| method returns the declared bindings of the injection point.</text> </assertion> <assertion id="ca"> - <text>The |javax.inject.manager.InjectionPoint.getMember()| method returns the |Field| object in the case of field injection</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Field| object in the case of field injection</text> </assertion> <assertion id="cb"> - <text>The |javax.inject.manager.InjectionPoint.getMember()| method returns the |Method| object in the case of method parameter injection</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Method| object in the case of method parameter injection</text> </assertion> <assertion id="cc"> - <text>The |javax.inject.manager.InjectionPoint.getMember()| method returns the |Constructor| object in the case of constructor parameter injection</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getMember()| method returns the |Constructor| object in the case of constructor parameter injection</text> </assertion> <assertion id="da"> - <text>The |javax.inject.manager.InjectionPoint.getAnnotation()| method returns annotations of the field in the case of field injection</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotation()| method returns annotations of the field in the case of field injection</text> </assertion> <assertion id="db"> - <text>The |javax.inject.manager.InjectionPoint.getAnnotation()| method returns annotations of the parameter in the case of method parameter</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotation()| method returns annotations of the parameter in the case of method parameter</text> </assertion> <assertion id="dc"> - <text>The |javax.inject.manager.InjectionPoint.getAnnotation()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotation()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text> </assertion> <assertion id="dd"> - <text>The |javax.inject.manager.InjectionPoint.getAnnotations()| method returns annotations of the field in the case of field injection</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotations()| method returns annotations of the field in the case of field injection</text> </assertion> <assertion id="de"> - <text>The |javax.inject.manager.InjectionPoint.getAnnotations()| method returns annotations of the parameter in the case of method parameter</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotations()| method returns annotations of the parameter in the case of method parameter</text> </assertion> <assertion id="df"> - <text>The |javax.inject.manager.InjectionPoint.getAnnotations()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text> + <text>The |javax.enterprise.inject.spi.InjectionPoint.getAnnotations()| method returns annotations annotations of the parameter in the case of constructor parameter injection.</text> </assertion> <assertion id="dg"> Modified: tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java =================================================================== --- tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/interceptor/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,11 +5,11 @@ import java.util.Set; import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import javax.inject.manager.InjectionPoint; import javax.inject.manager.Manager; -public abstract class ForwardingBean<T> extends Bean<T> +public abstract class ForwardingBean<T> implements Bean<T> { protected ForwardingBean(Manager manager) Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/pom.xml 2009-05-26 12:53:17 UTC (rev 2712) @@ -111,7 +111,7 @@ <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>jsr299-api</artifactId> - <version>1.0.0.PREVIEW1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> Modified: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java =================================================================== --- tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/ForwardingBean.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -5,11 +5,11 @@ import java.util.Set; import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import javax.inject.manager.InjectionPoint; import javax.inject.manager.Manager; -public abstract class ForwardingBean<T> extends Bean<T> +public abstract class ForwardingBean<T> implements Bean<T> { protected ForwardingBean(Manager manager) Modified: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-05-26 12:45:33 UTC (rev 2711) +++ tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-05-26 12:53:17 UTC (rev 2712) @@ -9,7 +9,7 @@ import javax.context.RequestScoped; import javax.inject.AnnotationLiteral; import javax.inject.CreationException; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions;

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2711 - in ri/trunk: api/src/main/java/javax/decorator and 82 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-05-26 08:45:33 -0400 (Tue, 26 May 2009) New Revision: 2711 Added: ri/trunk/api/src/main/java/javax/enterprise/ ri/trunk/api/src/main/java/javax/enterprise/context/ ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java ri/trunk/api/src/main/java/javax/enterprise/context/spi/ ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java ri/trunk/api/src/main/java/javax/enterprise/inject/ ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java ri/trunk/api/src/main/java/javax/enterprise/inject/New.java ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java Removed: ri/trunk/api/src/main/java/javax/annotation/ ri/trunk/api/src/main/java/javax/context/ ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java ri/trunk/api/src/main/java/javax/inject/BindingType.java ri/trunk/api/src/main/java/javax/inject/CreationException.java ri/trunk/api/src/main/java/javax/inject/Current.java ri/trunk/api/src/main/java/javax/inject/DeploymentType.java ri/trunk/api/src/main/java/javax/inject/Disposes.java ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java ri/trunk/api/src/main/java/javax/inject/Initializer.java ri/trunk/api/src/main/java/javax/inject/Instance.java ri/trunk/api/src/main/java/javax/inject/New.java ri/trunk/api/src/main/java/javax/inject/Produces.java ri/trunk/api/src/main/java/javax/inject/Production.java ri/trunk/api/src/main/java/javax/inject/Specializes.java ri/trunk/api/src/main/java/javax/inject/Standard.java ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java ri/trunk/api/src/main/java/javax/inject/manager/ ri/trunk/api/src/main/java/javax/webbeans/ Modified: ri/trunk/api/src/main/java/javax/decorator/Decorator.java ri/trunk/api/src/main/java/javax/event/Fires.java ri/trunk/api/src/main/java/javax/inject/Obtains.java ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java ri/trunk/impl/src/main/resources/ee/namespace ri/trunk/osgi-bundle/pom.xml ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml Log: Updated JSR-299 API to latest draft of the specification Modified: ri/trunk/api/src/main/java/javax/decorator/Decorator.java =================================================================== --- ri/trunk/api/src/main/java/javax/decorator/Decorator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/decorator/Decorator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; /** * Specifies that a class is a decorator. Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ApplicationScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,46 @@ +/* +* 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.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + + +/** + * Specifies that a bean is application scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@Inherited +public @interface ApplicationScoped +{ + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/ApplicationScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ContextNotActiveException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ContextNotActiveException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,58 @@ +/* + * 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.enterprise.context; + +import javax.inject.ExecutionException; + +/** + * A ContextNotActiveException is thrown if at a particular point in the + * execution of the program the scope is inactive with respect to the current + * thread. When the scope is inactive, any invocation of the get() from the + * current thread upon the Context object for that scope results in a + * ContextNotActiveException. + * + * @author Pete Muir + * @author Shane Bryzak + */ + +public class ContextNotActiveException extends ExecutionException +{ + + private static final long serialVersionUID = -3599813072560026919L; + + public ContextNotActiveException() + { + super(); + } + + public ContextNotActiveException(String message) + { + super(message); + } + + public ContextNotActiveException(Throwable cause) + { + super(cause); + } + + public ContextNotActiveException(String message, Throwable cause) + { + super(message, cause); + } + +} Copied: ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Conversation.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/Conversation.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,76 @@ +/* +* 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.enterprise.context; + +/** + * Provides conversation management operations + * + * @author Pete Muir + * + */ +public interface Conversation +{ + + /** + * Mark a transient conversation long running. The container will generate an + * id + */ + public void begin(); + + /** + * Mark a transient conversation long running. + * + * @param id the id of the conversation + */ + public void begin(String id); + + /** + * Mark a long running conversation transient + */ + public void end(); + + /** + * Determine if a conversation is long running or transient + * + * @return true if the conversation is long running + */ + public boolean isLongRunning(); + + /** + * Get the id associated with the current long running conversation + * + * @return the id of the current long running conversation + */ + public String getId(); + + /** + * Get the timeout for the current long running conversation. + * + * The conversation will destroy the conversation if it has not been accessed + * within this time period. + * + * @return the current timeout in milliseconds + */ + public long getTimeout(); + + /** + * Set the timeout for the current long running conversation + * + * @param milliseconds the new timeout in milliseconds + */ + public void setTimeout(long milliseconds); +} \ No newline at end of file Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ConversationScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* 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.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is conversation scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType(passivating = true) +public @interface ConversationScoped +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/ConversationScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Dependent.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,44 @@ +/* +* 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.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is dependent scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { METHOD, TYPE, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType(normal = false) +@Inherited +public @interface Dependent +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/Dependent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/RequestScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,44 @@ +/* +* 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.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is request scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@Inherited +public @interface RequestScoped +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/RequestScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/ScopeType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,51 @@ +/* + * 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.enterprise.context; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an annotation type is a scope type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface ScopeType +{ + + /** + * @return true if this is a normal scope + */ + boolean normal() default true; + + /** + * @return true if this is a passivating scope (beans with this scope + * type must be serializable) + */ + boolean passivating() default false; + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/ScopeType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/SessionScoped.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,44 @@ +/* +* 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.enterprise.context; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a bean is session scoped. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType(passivating = true) +@Inherited +public @interface SessionScoped +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/SessionScoped.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Context.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,75 @@ +/* + * 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.enterprise.context.spi; + +import java.lang.annotation.Annotation; + +import javax.enterprise.context.ContextNotActiveException; + +/** + * The contract between the manager and a contextual object. + * This interface should not be called directly by the application. + * + * @author Gavin King + * @author Pete Muir + */ + +public interface Context +{ + + /** + * The scope which this context implements + * + * @return the scope + */ + public Class<? extends Annotation> getScopeType(); + + /** + * Return an existing instance of a contextual type or create a new instance + * of a contextual type + * + * @param <T> the type of contextual type + * @param contextual the contextual type + * @param creationalContext the creational context in which incompletely + * initialized instances may be placed + * @return the contextual instance, or null if no creational context is given + * and an instance does not exist in the context + * @throws ContextNotActiveException if the context is not active + */ + public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext); + + /** + * Return an existing instance of a contextual type or create a new instance + * of a contextual type + * + * @param <T> the type of the contextual type + * @param contextual the contextual type + * @return the contextual instance, or null if an instance does not exist in + * the context + * @throws ContextNotActiveException if the context is not active + */ + public <T> T get(Contextual<T> contextual); + + /** + * The context is only active at certain points in the application lifecycle + * + * @return true if the context is active + */ + boolean isActive(); + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/context/spi/Context.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/Contextual.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/Contextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,50 @@ +/* + * 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.enterprise.context.spi; + +import javax.enterprise.inject.CreationException; + +/** + * The contract between a context and a contextual type This interface should + * not be implemented directly by the application. + * + * @author Nicklas Karlsson + * @author Pete Muir + */ +public interface Contextual<T> +{ + /** + * Create a new instance of the contextual type + * + * @param creationalContext + * the creational context in which incompletely initialized + * contexts may be placed + * @return the contextual instance + * @throws CreationException + * if a checked exception occurs whilst creating the instance + */ + public T create(CreationalContext<T> creationalContext); + + /** + * Destroys an instance of the contexual type + * + * @param instance + * the insance to destroy + */ + public void destroy(T instance); +} Copied: ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java (from rev 2700, ri/trunk/api/src/main/java/javax/context/CreationalContext.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -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.enterprise.context.spi; + +/** + * 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/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,54 @@ +/* + * 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.enterprise.inject; + +import javax.inject.DeploymentException; + +/** + * An AmbiguousDependencyException is thrown when within the set of enabled + * beans with the API type and bind- ing types declared there exists no unique + * Web Bean with a higher precedence than all other beans in the set. + * + * + * @author Pete Muir + */ +public class AmbiguousResolutionException extends DeploymentException +{ + + private static final long serialVersionUID = -2132733164534544788L; + + public AmbiguousResolutionException() + { + } + + public AmbiguousResolutionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public AmbiguousResolutionException(String message) + { + super(message); + } + + public AmbiguousResolutionException(Throwable throwable) + { + super(throwable); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,173 @@ +/* +* 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.enterprise.inject; + +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +import javax.inject.ExecutionException; + + +/** + * Supports inline instantiation of annotation type instances. + * + * @author Pete Muir + * @author Gavin King + * + * @param <T> + * the annotation type + */ +public abstract class AnnotationLiteral<T extends Annotation> implements + Annotation +{ + + private Class<T> annotationType; + private Method[] members; + + protected AnnotationLiteral() + { + Class<?> annotationLiteralSubclass = getAnnotationLiteralSubclass(this.getClass()); + if (annotationLiteralSubclass == null) + { + throw new RuntimeException(getClass() + "is not a subclass of AnnotationLiteral "); + } + + annotationType = getTypeParameter(annotationLiteralSubclass); + + if (annotationType == null) + { + throw new RuntimeException(getClass() + " is missing type parameter in AnnotationLiteral"); + } + + this.members = annotationType.getDeclaredMethods(); + } + + private static Class<?> getAnnotationLiteralSubclass(Class<?> clazz) + { + Class<?> superclass = clazz.getSuperclass(); + if (superclass.equals(AnnotationLiteral.class)) + { + return clazz; + } + else if (superclass.equals(Object.class)) + { + return null; + } + else + { + return (getAnnotationLiteralSubclass(superclass)); + } + } + + @SuppressWarnings("unchecked") + private static <T> Class<T> getTypeParameter(Class<?> annotationLiteralSuperclass) + { + Type type = annotationLiteralSuperclass.getGenericSuperclass(); + if (type instanceof ParameterizedType) + { + ParameterizedType parameterizedType = (ParameterizedType) type; + if (parameterizedType.getActualTypeArguments().length == 1) + { + return (Class<T>) parameterizedType + .getActualTypeArguments()[0]; + } + } + return null; + } + + public Class<? extends Annotation> annotationType() + { + return annotationType; + } + + @Override + public String toString() + { + String string = "@" + annotationType().getName() + "("; + for (int i = 0; i < members.length; i++) + { + string += members[i].getName() + "="; + string += invoke(members[i], this); + if (i < members.length - 1) + { + string += ","; + } + } + return string + ")"; + } + + @Override + public boolean equals(Object other) + { + if (other instanceof Annotation) + { + Annotation that = (Annotation) other; + if (this.annotationType().equals(that.annotationType())) + { + for (Method member : members) + { + Object thisValue = invoke(member, this); + Object thatValue = invoke(member, that); + if (!thisValue.equals(thatValue)) + { + return false; + } + } + return true; + } + } + return false; + } + + @Override + public int hashCode() + { + int hashCode = 0; + for (Method member : members) + { + int memberNameHashCode = 127 * member.getName().hashCode(); + int memberValueHashCode = invoke(member, this).hashCode(); + hashCode += memberNameHashCode ^ memberValueHashCode; + } + return hashCode; + } + + private static Object invoke(Method method, Object instance) + { + try + { + method.setAccessible(true); + return method.invoke(instance); + } + catch (IllegalArgumentException e) + { + throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + catch (IllegalAccessException e) + { + throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + catch (InvocationTargetException e) + { + throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + } +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/BindingType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,40 @@ +/* +* 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.enterprise.inject; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * + * Specifies that an annotation type is a binding type. + * + * @author Pete Muir + * @author Gavin King + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface BindingType +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/BindingType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/CreationException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,52 @@ +/* +* 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.enterprise.inject; + +import javax.inject.ExecutionException; + +/** + * Wraps any checked exceptions which occur during creation of an bean + * + * @author Pete Muir + */ +public class CreationException extends ExecutionException +{ + + private static final long serialVersionUID = 1002854668862145298L; + + public CreationException() + { + + } + + public CreationException(String message) + { + super(message); + } + + public CreationException(Throwable cause) + { + super(cause); + } + + public CreationException(String message, Throwable cause) + { + super(message, cause); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/CreationException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Current.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* 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.enterprise.inject; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * The default binding type. + * + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +public @interface Current +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Disposes.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* +* 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.enterprise.inject; + +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a parameter of a method of bean is the disposed parameter + * of a disposal method. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(PARAMETER) +@Retention(RUNTIME) +@Documented +public @interface Disposes +{ + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Disposes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,50 @@ +/* +* 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.enterprise.inject; + +import javax.inject.ExecutionException; + +/** + * Thrown if a producer method returns a null value or a producer field contains + * a null value, and the scope of the method or field is not @Dependent + */ +public class IllegalProductException extends ExecutionException +{ + + private static final long serialVersionUID = -6280627846071966243L; + + public IllegalProductException() + { + super(); + } + + public IllegalProductException(String message, Throwable cause) + { + super(message, cause); + } + + public IllegalProductException(String message) + { + super(message); + } + + public IllegalProductException(Throwable cause) + { + super(cause); + } + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/IllegalProductException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Initializer.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* + * 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.enterprise.inject; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a method of a bean is a bean initializer method, or that a + * constructor is the bean constructor. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { METHOD, CONSTRUCTOR }) +@Retention(RUNTIME) +@Documented +public @interface Initializer +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Initializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Instance.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Instance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,52 @@ +/* + * 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.enterprise.inject; + +import java.lang.annotation.Annotation; + +import javax.inject.DuplicateBindingTypeException; + + +/** + * An interface for looking up beans of a particular type. + * + * @author Gavin King + * + * @param <T> + * the type of the event object + */ + +public interface Instance<T> extends Iterable<T> +{ + /** + * Get an instance of a bean of the specified type. + * + * Additional binding annotations may be specified at the injection point. + * + * @param bindings + * Additional binding types + * @return an instance of a bean of the specified type + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + * @throws IllegalArgumentException + * if an instance of an annotation that is not a binding type is + * passed + * + */ + public T get(Annotation... bindings); +} Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java (from rev 2700, ri/trunk/api/src/main/java/javax/webbeans/Model.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Model.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,26 @@ +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.RequestScoped; + +/** + * A stereotype for MVC model objects + * + * @author Gavin King + */ + +@Named +@RequestScoped +@Stereotype +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +public @interface Model +{ +} \ No newline at end of file Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java (from rev 2700, ri/trunk/api/src/main/java/javax/annotation/Named.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies the name of a bean. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface Named +{ + + /** + * If no name is explicitly specified, the default name is used. + * + * For simple beans and session beans the default name is the unqualified + * class name of the bean class, after converting the first character to + * lower case. + * + * For producer methods the default name is the method name, unless the + * method follows the JavaBeans property getter naming convention, in which + * case the default name is the JavaBeans property name. + * + * @return the bean name + */ + public String value() default ""; + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Named.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/New.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/New.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/New.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/New.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* +* 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.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * The special binding type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { FIELD, PARAMETER }) +@Retention(RUNTIME) +@Documented +@BindingType +public @interface New +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/New.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java (from rev 2700, ri/trunk/api/src/main/java/javax/annotation/NonBinding.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -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.enterprise.inject; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that a member of a binding type or interceptor binding type is to + * be ignored for the purposes of resolution. + * + * @author Gavin King + * + */ +@Retention(RUNTIME) +@Target(METHOD) +public @interface NonBinding +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/NonBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Produces.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* + * 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.enterprise.inject; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * + * Specifies that a method of a bean is a producer method. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +@Documented +public @interface Produces +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Produces.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java (from rev 2700, ri/trunk/api/src/main/java/javax/annotation/Stereotype.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,55 @@ +/* +* 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.enterprise.inject; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Annotation; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an annotation type is a stereotype. + * + * @author Pete Muir + * @author Gavin King + */ + +@Retention(RUNTIME) +@Target(ANNOTATION_TYPE) +@Documented +public @interface Stereotype +{ + + /** + * Restrict the scope of the stereotyped bean + * + * @return the allowed scopes + */ + public Class<? extends Annotation>[] supportedScopes() default {}; + + /** + * Require that stereotype beans have certain API types + * + * @return the required types + */ + public Class<?>[] requiredTypes() default {}; + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/Stereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,121 @@ +/* +* 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.enterprise.inject; + +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +/** + * Supports inline instantiation of objects that represent parameterized types + * with actual type parameters. + * + * @author Gavin King + * @author Pete Muir + * + * @param <T> + * the type, including all actual type parameters + */ +public abstract class TypeLiteral<T> +{ + + private Type actualType; + + protected TypeLiteral() + { + Class<?> typeLiteralSubclass = getTypeLiteralSubclass(this.getClass()); + if (typeLiteralSubclass == null) + { + throw new RuntimeException(getClass() + " is not a subclass of TypeLiteral"); + } + actualType = getTypeParameter(typeLiteralSubclass); + if (actualType == null) + { + throw new RuntimeException(getClass() + " is missing type parameter in TypeLiteral"); + } + } + + /** + * Get the actual type represented by type literal + * + * @return + */ + public final Type getType() + { + return actualType; + } + + /** + * Get the raw type represented by the type literal + * + * @return + */ + @SuppressWarnings("unchecked") + public final Class<T> getRawType() { + Type type = getType(); + if (type instanceof Class) + { + return (Class<T>) type; + } + else if (type instanceof ParameterizedType) + { + return (Class<T>) ((ParameterizedType) type).getRawType(); + } + else if (type instanceof GenericArrayType) + { + return (Class<T>) Object[].class; + } + else + { + throw new RuntimeException("Illegal type"); + } + } + + private static Class<?> getTypeLiteralSubclass(Class<?> clazz) + { + Class<?> superclass = clazz.getSuperclass(); + if (superclass.equals(TypeLiteral.class)) + { + return clazz; + } + else if (superclass.equals(Object.class)) + { + return null; + } + else + { + return (getTypeLiteralSubclass(superclass)); + } + } + + private static Type getTypeParameter(Class<?> superclass) + { + Type type = superclass.getGenericSuperclass(); + if (type instanceof ParameterizedType) + { + ParameterizedType parameterizedType = (ParameterizedType) type; + if (parameterizedType.getActualTypeArguments().length == 1) + { + return parameterizedType.getActualTypeArguments()[0]; + } + } + return null; + } + + // TODO: equals(), hashCode() +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/TypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,56 @@ +/* + * 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.enterprise.inject; + +import javax.inject.DeploymentException; + +/** + * Thrown if a bean has normal scope and the type cannot be proxied by the + * container + * + * @author Pete Muir + */ +public class UnproxyableResolutionException extends DeploymentException +{ + + private static final long serialVersionUID = 1667539354548135465L; + + public UnproxyableResolutionException() + { + super(); + } + + public UnproxyableResolutionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnproxyableResolutionException(String message) + { + super(message); + } + + public UnproxyableResolutionException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,55 @@ +/* + * 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.enterprise.inject; + +import javax.inject.DeploymentException; + +/** + * Thrown if no beans can be resolved + * + * @author Pete Muir + */ +public class UnsatisfiedResolutionException extends DeploymentException +{ + + private static final long serialVersionUID = 5350603312442756709L; + + public UnsatisfiedResolutionException() + { + super(); + } + + public UnsatisfiedResolutionException(String message, Throwable throwable) + { + super(message, throwable); + } + + public UnsatisfiedResolutionException(String message) + { + super(message); + } + + public UnsatisfiedResolutionException(Throwable throwable) + { + super(throwable); + } + + + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/DeploymentType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,39 @@ +/* +* 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.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an annotation type is a deployment type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target(ANNOTATION_TYPE) +@Retention(RUNTIME) +@Documented +public @interface DeploymentType +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Production.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* 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.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * The default deployment type. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +public @interface Production +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Production.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Specializes.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* +* 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.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Specifies that an implementation class directly specializes its superclass, + * of that a producer method directly specializes the method it overrides. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Documented +public @interface Specializes +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Specializes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/Standard.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,42 @@ +/* +* 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.enterprise.inject.deployment; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Deployment type for standard components defined by the JSR-299 specification. + * + * @author Gavin King + * @author Pete Muir + */ + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +public @interface Standard +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/deployment/Standard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Deployed.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,41 @@ +/* + * 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.enterprise.inject.spi; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +/** + * Event binding type for the event that is raised by the manager when + * it has completed resolving and validation + * + * @author Pete Muir + */ + +@BindingType +@Retention(RUNTIME) +@Target( { FIELD, PARAMETER }) +public @interface AfterBeanDiscovery +{ +} Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Bean.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,85 @@ +/* + * 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.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.context.spi.Contextual; + +public interface Bean<T> extends Contextual<T> +{ + + /** + * The client-visible types of a bean + * + * @return the bean types + */ + public Set<Type> getTypes(); + + /** + * The bindings of a bean + * + * @return the bindings + */ + public Set<Annotation> getBindings(); + + /** + * The scope of a bean + * + * @return the scope + */ + public Class<? extends Annotation> getScopeType(); + + /** + * The deployment type of a bean + * + * @return the deployment type + */ + public Class<? extends Annotation> getDeploymentType(); + + /** + * The name of a bean + * + * @return the name + */ + public String getName(); + + /** + * The serializability of a bean + * + * @return true if the bean is serializable + */ + public boolean isSerializable(); + + /** + * The nullability of a bean + * + * @return true if the bean is nullable + */ + public boolean isNullable(); + + /** + * The injection points of a bean + * + * @return the injection points of a bean + */ + public Set<InjectionPoint> getInjectionPoints(); + +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Bean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Manager.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,453 @@ +/* + * 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.enterprise.inject.spi; + +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Set; + +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.event.Observer; +import javax.inject.DuplicateBindingTypeException; + +/** + * The contract between the application and the manager. Also the contract + * between the manager and Bean, Context and Observer objects. + * + * The application should not normally need to call this interface. + * + * @author Gavin King + * @author Pete Muir + * + */ +public interface BeanManager +{ + + /** + * Allows beans to be matched to injection point by considering bean type, + * bindings, and deployment precedence. + * + * Typesafe resolution usually occurs at container deployment time. + * + * @param <T> + * the type of the beans to be resolved + * @param type + * the type of the beans to be resolved + * @param bindings + * the bindings used to restrict the matched beans + * @return the matched beans + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings); + + /** + * Allows beans to be matched to injection point by considering bean type, + * bindings, and deployment precedence. + * + * Typesafe resolution usually occurs at container deployment time. + * + * @param <T> + * the type of the beans to be resolved + * @param type + * the type of the beans to be resolved + * @param bindings + * the bindings used to restrict the matched beans + * @return the matched beans + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings); + + /** + * Obtains an instance of a bean by considering bean type, bindings, and + * deployment precedence. + * + * @param <T> + * the type of the bean to obtain + * @param type + * the type of the bean to obtain + * @param bindings + * the bindings used to restrict the matched beans + * @return an instance of the bean + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + * @throws UnsatisfiedResolutionException + * if no bean can be resolved for the given type and bindings + * @throws AmbiguousResolutionException + * if more than one bean is resolved for the given type and + * bindings + */ + public <T> T getInstanceByType(Class<T> type, Annotation... bindings); + + /** + * Obtains an instance of a bean by considering bean type, bindings, and + * deployment precedence. + * + * @param <T> + * the type of the bean to obtain + * @param type + * the type of the bean to obtain + * @param bindings + * the bindings used to restrict the matched beans + * @return an instance of the bean + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + * @throws UnsatisfiedResolutionException + * if no bean can be resolved for the given type and bindings + * @throws AmbiguousResolutionException + * if more than one bean is resolved for the given type and + * bindings + */ + public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings); + + /** + * Allows beans to be matched by considering the bean name and deployment + * precedence. + * + * Used in an environment that doesn't support typing such EL. + * + * @param name + * the name used to restrict the beans matched + * @return the matched beans + */ + public Set<Bean<?>> getBeans(String name); + + /** + * Obtains an instance of a bean by considering the bean name and deployment + * precedence. + * + * Used in an environment that doesn't support typing such EL. + * + * @param name + * the name used to restrict the beans matched + * @return an instance of the bean or null if no beans matched + * @throws AmbiguousResolutionException + * if more than one bean matches + */ + public Object getInstanceByName(String name); + + /** + * Obtains an instance of a bean + * + * @param <T> + * the type of the bean + * @param bean + * the bean to obtain an instance of + * @return an instance of the bean + */ + public <T> T getInstance(Bean<T> bean); + + /** + * Obtains an instance of bean for a given injection point. + * + * This method should not be called by an application. + * + * @param <T> + * the type of the bean + * @param injectionPoint + * the injection point the instance is needed for + * @param creationalContext + * the context in which the injection is occurring + * @return an instance of the bean + * @throws UnsatisfiedResolutionException + * if no bean can be resolved for the given type and bindings + * @throws AmbiguousResolutionException + * if more than one bean is resolved for the given type and + * bindings + */ + public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> creationalContext); + + /** + * Fire an event + * + * @param event + * the event object + * @param bindings + * the event bindings used to restrict the observers matched + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + */ + public void fireEvent(Object event, Annotation... bindings); + + /** + * Obtain an active context instance for the given scope type. + * + * @param scopeType + * the scope to get the context instance for + * @return the context instance + * @throws ContextNotActiveException + * if no active contexts exist for the given scope type + * @throws IllegalArgumentException + * if more than one active context exists for the given scope type + */ + public Context getContext(Class<? extends Annotation> scopeType); + + /** + * Associate a custom Context with a scope. + * + * This method may be called at any time in the applications lifecycle. + * + * @param context + * the context to register + * @return the manager the context was registered with + */ + public BeanManager addContext(Context context); + + /** + * Allows a new bean to be registered. + * + * This method may be called at any time in the applications lifecycle. + * + * @param bean + * the bean to register + * @return the manager the bean was registered with + */ + public BeanManager addBean(Bean<?> bean); + + /** + * Allows a new interceptor to be registered. + * + * This method may be called at any time in the applications lifecycle. + * + * @param abstractInterceptor + * the interceptor to register + * @return the manager the interceptor was registered with + */ + public BeanManager addInterceptor(Interceptor abstractInterceptor); + + /** + * Allows a new decorator to be registered. + * + * This method may be called at any time in the applications lifecycle. + * + * @param abstractDecorator + * the decorator to register + * @return the manager the decorator was registered with + */ + public BeanManager addDecorator(Decorator abstractDecorator); + + /** + * Allows additional XML based to be provided. + * + * This method may be called at any time in the applications lifecycle. + * + * @param xmlStream + * the XML metadata + * @return the manager the XML metadata was registered with + */ + public BeanManager parse(InputStream xmlStream); + + /** + * Create a new child activity. A child activity inherits all beans, + * interceptors, decorators, observers, and contexts defined by its direct + * and indirect parent activities. + * + * This method should not be called by the application. + * + * @return the child activity + */ + public BeanManager createActivity(); + + /** + * Associate an activity with the current context for a normal scope + * + * @param scopeType + * the scope to associate the activity with + * @return the activity + * @throws ContextNotActiveException + * if the given scope is inactive + * @throws IllegalArgumentException + * if the given scope is not a normal scope + */ + public BeanManager setCurrent(Class<? extends Annotation> scopeType); + + /** + * Register an observer with the container + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer observes + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); + + /** + * Register an observer with the container + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer observes + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); + + /** + * Remove an observer registration + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer obseres + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); + + /** + * Remove an observer registration + * + * @param <T> + * the type of the observer + * @param observer + * the observer to register + * @param eventType + * the event type the observer obseres + * @param bindings + * event bindings to further restrict the events observed + * @return the manager the observer was registered with + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> BeanManager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); + + /** + * Obtains observers for an event by considering event type and bindings. + * + * @param <T> + * the type of the event to obtain + * @param event + * the event object + * @param bindings + * the bindings used to restrict the matched observers + * @return the resolved observers + * @throws IllegalArgumentException + * if a parameterized type with a type parameter or a wildcard is + * passed + * @throws IllegalArgumentException + * if an annotation which is not a event binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings); + + /** + * Obtains an ordered list of enabled interceptors for a set interceptor + * bindings + * + * @param type + * the type of the interception + * @param bindings + * the bindings used to restrict the matched interceptors + * @return the resolved interceptors + * @throws IllegalArgumentException + * if no interceptor binding type is passed + * @throws IllegalArgumentException + * if an annotation which is not a interceptor binding type is + * passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings); + + /** + * Obtains an ordered list of enabled decorators for a set of bean types and + * a set of bindings + * + * @param types + * the set of bean types of the decorated bean + * @param bindings + * the bindings declared by the decorated bean + * @return the resolved decorators + * @throws IllegalArgumentException + * if the set of bean types is empty + * @throws IllegalArgumentException + * if an annotation which is not a binding type is passed + * @throws DuplicateBindingTypeException + * if two instances of the same binding type are passed + */ + public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindings); + +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Initialized.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,40 @@ +/* + * 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.enterprise.inject.spi; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +/** + * Event binding type for the event that is raised by the manager when + * it has completed discovery and bean creation + * + * @author Pete Muir + */ +@BindingType +@Retention(RUNTIME) +@Target( { FIELD, PARAMETER }) +public @interface BeforeBeanDiscovery +{ +} Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,48 @@ +/* + * 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.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.util.Set; + +public interface Decorator<T> extends Bean<T> +{ + + /** + * Obtains the type of the decorated bean + * + * @return + */ + public Class<?> getDelegateType(); + + /** + * Obtains the bindings of the decorated bean + * + * @return + */ + public Set<Annotation> getDelegateBindings(); + + /** + * Injects the delegate + * + * @param instance the instance to inject the delegate into + * @param delegate the delegate to inject + */ + public void setDelegate(Object instance, Object delegate); + +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Decorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/InjectionPoint.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Member; +import java.lang.reflect.Type; +import java.util.Set; + + + +/** + * + * Provides access to metadata about the injection point into which a dependent + * object is injected. + * + * @author Gavin King + * @author Pete Muir + */ +public interface InjectionPoint +{ + + /** + * Get the declared type of injection point + * + * If the injection point is declared in XML, the type and binding types are + * determined according to Section 10.8, �Specifying API types and binding + * types�. + * + * @return the declared type of the injection point + */ + public Type getType(); + + /** + * Get the declared binding types of the injection point + * + * If the injection point is declared in XML, the type and binding types are + * determined according to Section 10.8, �Specifying API types and binding + * types�. + * + * @return the declared binding types of the injection point + */ + public Set<Annotation> getBindings(); + + /** + * Get the Bean object representing the Web Bean that defines the injection + * point + * + * @return the Bean object representing the Web Bean that defines the + * injection point + */ + public Bean<?> getBean(); + + /** + * Get the Field object in the case of field injection, the Method object in + * the case of method parameter injection or the Constructor object in the + * case of constructor parameter injection. + * + * @return the member being injected into + */ + public Member getMember(); + + /** + * Get the annotation instance for the given annotation type of the field in + * the case of field injection, or annotations of the parameter in the case + * of method parameter or constructor parameter injection. + * + * @param <T> + * the type of the annotation + * @param annotationType + * the type of the annotation + * @return the annotation of the specified annotationType, or null if no such + * annotation exists + */ + public <T extends Annotation> T getAnnotation(Class<T> annotationType); + + /** + * Get the annotations of the field in the case of field injection, or + * annotations of the parameter in the case of method parameter or + * constructor parameter injection. + * + * @return the annotations of the field + */ + public Annotation[] getAnnotations(); + + /** + * Determine if the specified annotation is present on the injection point + * + * @param annotationType + * the type of the annotation + * @return true if an annotation of the specified type is present, else false + */ + public boolean isAnnotationPresent(Class<? extends Annotation> annotationType); +} Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/InterceptionType.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,53 @@ +/* + * 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.enterprise.inject.spi; + +/** + * Identifies the kind of lifecycle callback or business method + * + * @author Pete Muir + * + */ +public enum InterceptionType +{ + + /** + * Intercepts method invocation + */ + AROUND_INVOKE, + + /** + * Intercepts bean construction + */ + POST_CONSTRUCT, + + /** + * Intercepts bean destruction + */ + PRE_DESTROY, + + /** + * Intercepts bean passivation + */ + PRE_PASSIVATE, + + /** + * Intercepts bean activation + */ + POST_ACTIVATE +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/InterceptionType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Interceptor.java) =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java (rev 0) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,46 @@ +/* + * 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.enterprise.inject.spi; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Set; + + +public interface Interceptor<T> extends Bean<T> +{ + + /** + * The interceptor bindings used to bind an interceptor to a bean + * + * @return the interceptor bindings + */ + public Set<Annotation> getInterceptorBindingTypes(); + + /** + * The interceptor method for the specified lifecycle callback or business + * method + * + * @param type + * the interception type + * @return the method, or null if the interceptor does not intercept + * lifecycle callbacks or business methods + */ + public Method getMethod(InterceptionType type); + +} \ No newline at end of file Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/Interceptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/api/src/main/java/javax/event/Fires.java =================================================================== --- ri/trunk/api/src/main/java/javax/event/Fires.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/event/Fires.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * Annotates a variable to be injected with an Event object that can be fired and Deleted: ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/AmbiguousDependencyException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,52 +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 javax.inject; - -/** - * An AmbiguousDependencyException is thrown when within the set of enabled - * beans with the API type and bind- ing types declared there exists no unique - * Web Bean with a higher precedence than all other beans in the set. - * - * - * @author Pete Muir - */ -public class AmbiguousDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = -2132733164534544788L; - - public AmbiguousDependencyException() - { - } - - public AmbiguousDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public AmbiguousDependencyException(String message) - { - super(message); - } - - public AmbiguousDependencyException(Throwable throwable) - { - super(throwable); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/AnnotationLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,171 +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 javax.inject; - -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; - - -/** - * Supports inline instantiation of annotation type instances. - * - * @author Pete Muir - * @author Gavin King - * - * @param <T> - * the annotation type - */ -public abstract class AnnotationLiteral<T extends Annotation> implements - Annotation -{ - - private Class<T> annotationType; - private Method[] members; - - protected AnnotationLiteral() - { - Class<?> annotationLiteralSubclass = getAnnotationLiteralSubclass(this.getClass()); - if (annotationLiteralSubclass == null) - { - throw new RuntimeException(getClass() + "is not a subclass of AnnotationLiteral "); - } - - annotationType = getTypeParameter(annotationLiteralSubclass); - - if (annotationType == null) - { - throw new RuntimeException(getClass() + " is missing type parameter in AnnotationLiteral"); - } - - this.members = annotationType.getDeclaredMethods(); - } - - private static Class<?> getAnnotationLiteralSubclass(Class<?> clazz) - { - Class<?> superclass = clazz.getSuperclass(); - if (superclass.equals(AnnotationLiteral.class)) - { - return clazz; - } - else if (superclass.equals(Object.class)) - { - return null; - } - else - { - return (getAnnotationLiteralSubclass(superclass)); - } - } - - @SuppressWarnings("unchecked") - private static <T> Class<T> getTypeParameter(Class<?> annotationLiteralSuperclass) - { - Type type = annotationLiteralSuperclass.getGenericSuperclass(); - if (type instanceof ParameterizedType) - { - ParameterizedType parameterizedType = (ParameterizedType) type; - if (parameterizedType.getActualTypeArguments().length == 1) - { - return (Class<T>) parameterizedType - .getActualTypeArguments()[0]; - } - } - return null; - } - - public Class<? extends Annotation> annotationType() - { - return annotationType; - } - - @Override - public String toString() - { - String string = "@" + annotationType().getName() + "("; - for (int i = 0; i < members.length; i++) - { - string += members[i].getName() + "="; - string += invoke(members[i], this); - if (i < members.length - 1) - { - string += ","; - } - } - return string + ")"; - } - - @Override - public boolean equals(Object other) - { - if (other instanceof Annotation) - { - Annotation that = (Annotation) other; - if (this.annotationType().equals(that.annotationType())) - { - for (Method member : members) - { - Object thisValue = invoke(member, this); - Object thatValue = invoke(member, that); - if (!thisValue.equals(thatValue)) - { - return false; - } - } - return true; - } - } - return false; - } - - @Override - public int hashCode() - { - int hashCode = 0; - for (Method member : members) - { - int memberNameHashCode = 127 * member.getName().hashCode(); - int memberValueHashCode = invoke(member, this).hashCode(); - hashCode += memberNameHashCode ^ memberValueHashCode; - } - return hashCode; - } - - private static Object invoke(Method method, Object instance) - { - try - { - method.setAccessible(true); - return method.invoke(instance); - } - catch (IllegalArgumentException e) - { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - catch (IllegalAccessException e) - { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - catch (InvocationTargetException e) - { - throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); - } - } -} Deleted: ri/trunk/api/src/main/java/javax/inject/BindingType.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/BindingType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/BindingType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,40 +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 javax.inject; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * - * Specifies that an annotation type is a binding type. - * - * @author Pete Muir - * @author Gavin King - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface BindingType -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/CreationException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/CreationException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/CreationException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,50 +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 javax.inject; - -/** - * Wraps any checked exceptions which occur during creation of an bean - * - * @author Pete Muir - */ -public class CreationException extends ExecutionException -{ - - private static final long serialVersionUID = 1002854668862145298L; - - public CreationException() - { - - } - - public CreationException(String message) - { - super(message); - } - - public CreationException(Throwable cause) - { - super(cause); - } - - public CreationException(String message, Throwable cause) - { - super(message, cause); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/Current.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Current.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Current.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,42 +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 javax.inject; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * The default binding type. - * - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface Current -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/DeploymentType.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/DeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/DeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,39 +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 javax.inject; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an annotation type is a deployment type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(ANNOTATION_TYPE) -@Retention(RUNTIME) -@Documented -public @interface DeploymentType -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Disposes.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Disposes.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Disposes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +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 javax.inject; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that a parameter of a method of bean is the disposed parameter - * of a disposal method. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(PARAMETER) -@Retention(RUNTIME) -@Documented -public @interface Disposes -{ - -} Deleted: ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/IllegalProductException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,48 +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 javax.inject; - -/** - * Thrown if a producer method returns a null value or a producer field contains - * a null value, and the scope of the method or field is not @Dependent - */ -public class IllegalProductException extends ExecutionException -{ - - private static final long serialVersionUID = -6280627846071966243L; - - public IllegalProductException() - { - super(); - } - - public IllegalProductException(String message, Throwable cause) - { - super(message, cause); - } - - public IllegalProductException(String message) - { - super(message); - } - - public IllegalProductException(Throwable cause) - { - super(cause); - } - -} Deleted: ri/trunk/api/src/main/java/javax/inject/Initializer.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Initializer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Initializer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +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 javax.inject; - -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that a method of a bean is a bean initializer method, or that a - * constructor is the bean constructor. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { METHOD, CONSTRUCTOR }) -@Retention(RUNTIME) -@Documented -public @interface Initializer -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Instance.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Instance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Instance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,50 +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 javax.inject; - -import java.lang.annotation.Annotation; - - -/** - * An interface for looking up beans of a particular type. - * - * @author Gavin King - * - * @param <T> - * the type of the event object - */ - -public interface Instance<T> -{ - /** - * Get an instance of a bean of the specified type. - * - * Additional binding annotations may be specified at the injection point. - * - * @param bindings - * Additional binding types - * @return an instance of a bean of the specified type - * @throws DuplicateBindingTypeException - * if two instances of the same binding type are passed - * @throws IllegalArgumentException - * if an instance of an annotation that is not a binding type is - * passed - * - */ - public T get(Annotation... bindings); -} Deleted: ri/trunk/api/src/main/java/javax/inject/New.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/New.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/New.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +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 javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * The special binding type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { FIELD, PARAMETER }) -@Retention(RUNTIME) -@Documented -@BindingType -public @interface New -{ -} Modified: ri/trunk/api/src/main/java/javax/inject/Obtains.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Obtains.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Obtains.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,6 +26,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import javax.enterprise.inject.BindingType; + /** * Annotates a variable to be injected with an Instance object. * Deleted: ri/trunk/api/src/main/java/javax/inject/Produces.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Produces.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Produces.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +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 javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * - * Specifies that a method of a bean is a producer method. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -@Documented -public @interface Produces -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Production.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Production.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Production.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,42 +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 javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * The default deployment type. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface Production -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Specializes.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Specializes.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Specializes.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,41 +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 javax.inject; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an implementation class directly specializes its superclass, - * of that a producer method directly specializes the method it overrides. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target({TYPE, METHOD}) -@Retention(RUNTIME) -@Documented -public @interface Specializes -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/Standard.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/Standard.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/Standard.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,42 +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 javax.inject; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Deployment type for standard components defined by the JSR-299 specification. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface Standard -{ -} Deleted: ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/TypeLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,121 +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 javax.inject; - -import java.lang.reflect.GenericArrayType; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; - -/** - * Supports inline instantiation of objects that represent parameterized types - * with actual type parameters. - * - * @author Gavin King - * @author Pete Muir - * - * @param <T> - * the type, including all actual type parameters - */ -public abstract class TypeLiteral<T> -{ - - private Type actualType; - - protected TypeLiteral() - { - Class<?> typeLiteralSubclass = getTypeLiteralSubclass(this.getClass()); - if (typeLiteralSubclass == null) - { - throw new RuntimeException(getClass() + " is not a subclass of TypeLiteral"); - } - actualType = getTypeParameter(typeLiteralSubclass); - if (actualType == null) - { - throw new RuntimeException(getClass() + " is missing type parameter in TypeLiteral"); - } - } - - /** - * Get the actual type represented by type literal - * - * @return - */ - public final Type getType() - { - return actualType; - } - - /** - * Get the raw type represented by the type literal - * - * @return - */ - @SuppressWarnings("unchecked") - public final Class<T> getRawType() { - Type type = getType(); - if (type instanceof Class) - { - return (Class<T>) type; - } - else if (type instanceof ParameterizedType) - { - return (Class<T>) ((ParameterizedType) type).getRawType(); - } - else if (type instanceof GenericArrayType) - { - return (Class<T>) Object[].class; - } - else - { - throw new RuntimeException("Illegal type"); - } - } - - private static Class<?> getTypeLiteralSubclass(Class<?> clazz) - { - Class<?> superclass = clazz.getSuperclass(); - if (superclass.equals(TypeLiteral.class)) - { - return clazz; - } - else if (superclass.equals(Object.class)) - { - return null; - } - else - { - return (getTypeLiteralSubclass(superclass)); - } - } - - private static Type getTypeParameter(Class<?> superclass) - { - Type type = superclass.getGenericSuperclass(); - if (type instanceof ParameterizedType) - { - ParameterizedType parameterizedType = (ParameterizedType) type; - if (parameterizedType.getActualTypeArguments().length == 1) - { - return parameterizedType.getActualTypeArguments()[0]; - } - } - return null; - } - - // TODO: equals(), hashCode() -} Deleted: ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/UnproxyableDependencyException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,54 +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 javax.inject; - -/** - * Thrown if a bean has normal scope and the type cannot be proxied by the - * container - * - * @author Pete Muir - */ -public class UnproxyableDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = 1667539354548135465L; - - public UnproxyableDependencyException() - { - super(); - } - - public UnproxyableDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public UnproxyableDependencyException(String message) - { - super(message); - } - - public UnproxyableDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Deleted: ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java =================================================================== --- ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/inject/UnsatisfiedDependencyException.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,53 +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 javax.inject; - -/** - * Thrown if no beans can be resolved - * - * @author Pete Muir - */ -public class UnsatisfiedDependencyException extends DeploymentException -{ - - private static final long serialVersionUID = 5350603312442756709L; - - public UnsatisfiedDependencyException() - { - super(); - } - - public UnsatisfiedDependencyException(String message, Throwable throwable) - { - super(message, throwable); - } - - public UnsatisfiedDependencyException(String message) - { - super(message); - } - - public UnsatisfiedDependencyException(Throwable throwable) - { - super(throwable); - } - - - -} Modified: ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java =================================================================== --- ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/api/src/main/java/javax/interceptor/Interceptor.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -23,7 +23,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; /** * Specifies that a class is an interceptor. Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * The conversation context concurrent access wait timeout on a lock Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * The conversation id request parameter name Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; /** * The conversation context inactivity timeout Modified: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java =================================================================== --- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.util.Set; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; /** * A conversation manager responsible for starting, resuming and ending conversations Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,22 +26,23 @@ import java.util.List; import java.util.Set; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.New; +import javax.enterprise.inject.UnproxyableResolutionException; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Event; import javax.event.Fires; -import javax.inject.AmbiguousDependencyException; import javax.inject.DefinitionException; import javax.inject.InconsistentSpecializationException; -import javax.inject.Instance; -import javax.inject.New; import javax.inject.NullableDependencyException; import javax.inject.Obtains; -import javax.inject.UnproxyableDependencyException; -import javax.inject.UnsatisfiedDependencyException; import javax.inject.UnserializableDependencyException; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.bean.NewEnterpriseBean; import org.jboss.webbeans.bean.NewSimpleBean; import org.jboss.webbeans.bean.RIBean; @@ -77,7 +78,7 @@ */ public void validate() { - final List<Bean<?>> specializedBeans = new ArrayList<Bean<?>>(); + final List<BaseBean<?>> specializedBeans = new ArrayList<BaseBean<?>>(); for (Bean<?> bean : manager.getBeans()) { for (InjectionPoint injectionPoint : bean.getInjectionPoints()) @@ -108,16 +109,16 @@ Set<?> resolvedBeans = manager.resolveByType(annotatedItem, injectionPoint, bindings); if (resolvedBeans.isEmpty()) { - throw new UnsatisfiedDependencyException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has unsatisfied dependencies with binding types "); + throw new UnsatisfiedResolutionException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has unsatisfied dependencies with binding types "); } if (resolvedBeans.size() > 1) { - throw new AmbiguousDependencyException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has ambiguous dependencies"); + throw new AmbiguousResolutionException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has ambiguous dependencies"); } Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next(); if (manager.getServices().get(MetaDataCache.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) { - throw new UnproxyableDependencyException("The injection point " + injectionPoint + " has non-proxyable dependencies"); + throw new UnproxyableResolutionException("The injection point " + injectionPoint + " has non-proxyable dependencies"); } if (Reflections.isPrimitive(annotatedItem.getRawType()) && resolvedBean.isNullable()) { @@ -147,7 +148,7 @@ boolean normalScoped = manager.getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { - throw new UnproxyableDependencyException("Normal scoped bean " + bean + " is not proxyable"); + throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -25,7 +25,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.webbeans.bootstrap.api.Singleton; import org.jboss.webbeans.bootstrap.api.SingletonProvider; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/InstanceImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,9 +18,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Iterator; import java.util.Set; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import org.jboss.webbeans.injection.resolution.ResolvableAnnotatedClass; @@ -59,8 +60,8 @@ * @param bindings The binding types * @return The instance * - * @see javax.inject.Instance#get(Annotation...) - * @see javax.inject.manager.Manager#getInstanceByType(Class, Annotation...) + * @see javax.enterprise.inject.Instance#get(Annotation...) + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByType(Class, Annotation...) */ public T get(Annotation... bindings) { @@ -79,4 +80,10 @@ return "Obtainable instance for type " + type + " and binding types " + bindings; } + public Iterator<T> iterator() + { + // TODO Auto-generated method stub + return null; + } + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -40,26 +40,28 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.context.Context; -import javax.context.ContextNotActiveException; -import javax.context.CreationalContext; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.UnproxyableResolutionException; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Decorator; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.InterceptionType; +import javax.enterprise.inject.spi.Interceptor; import javax.event.Observer; -import javax.inject.AmbiguousDependencyException; -import javax.inject.BindingType; import javax.inject.DeploymentException; import javax.inject.DuplicateBindingTypeException; -import javax.inject.Production; -import javax.inject.Standard; -import javax.inject.TypeLiteral; -import javax.inject.UnproxyableDependencyException; -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; +import org.jboss.webbeans.bean.AbstractDecorator; +import org.jboss.webbeans.bean.AbstractInterceptor; import org.jboss.webbeans.bean.DisposalMethodBean; import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.NewEnterpriseBean; @@ -188,7 +190,7 @@ * ******************************** */ private transient final ThreadLocal<Stack<InjectionPoint>> currentInjectionPoint; - private transient List<Bean<?>> beans; + private transient List<Bean<?>> beanWithManagers; private final transient Namespace rootNamespace; private final transient ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers; private final transient Set<ManagerImpl> childActivities; @@ -275,7 +277,7 @@ ) { this.services = serviceRegistry; - this.beans = beans; + this.beanWithManagers = beans; this.newEnterpriseBeans = newEnterpriseBeans; this.riBeans = riBeans; this.clientProxyProvider = clientProxyProvider; @@ -331,16 +333,16 @@ * @param bean The bean to register * @return A reference to manager * - * @see javax.inject.manager.Manager#addBean(javax.inject.manager.Bean) + * @see javax.enterprise.inject.spi.BeanManager#addBean(javax.inject.manager.Bean) */ - public Manager addBean(Bean<?> bean) + public BeanManager addBean(Bean<?> bean) { - if (beans.contains(bean)) + if (beanWithManagers.contains(bean)) { return this; } resolver.clear(); - beans.add(bean); + beanWithManagers.add(bean); registerBeanNamespace(bean); for (ManagerImpl childActivity : childActivities) { @@ -360,7 +362,7 @@ public <T> Set<DisposalMethodBean<T>> resolveDisposalBeans(Class<T> apiType, Annotation... bindings) { // Correct? - Set<Bean<T>> beans = resolveByType(apiType, bindings); + Set<Bean<T>> beans = getBeans(apiType, bindings); Set<DisposalMethodBean<T>> disposalBeans = new HashSet<DisposalMethodBean<T>>(); for (Bean<T> bean : beans) if (bean instanceof DisposalMethodBean) @@ -375,7 +377,7 @@ * @param bindings The binding types to match * @return The set of matching observers * - * @see javax.inject.manager.Manager#resolveObservers(java.lang.Object, + * @see javax.enterprise.inject.spi.BeanManager#resolveObservers(java.lang.Object, * java.lang.annotation.Annotation[]) */ public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings) @@ -454,10 +456,10 @@ * @param bindings The binding types to match * @return The set of matching beans * - * @see javax.inject.manager.Manager#resolveByType(java.lang.Class, + * @see javax.enterprise.inject.spi.BeanManager#getBeans(java.lang.Class, * java.lang.annotation.Annotation[]) */ - public <T> Set<Bean<T>> resolveByType(Class<T> type, Annotation... bindings) + public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings) { return resolveByType(ResolvableAnnotatedClass.of(type, bindings), bindings); } @@ -469,10 +471,10 @@ * @param bindings The binding types to match * @return The set of matching beans * - * @see javax.inject.manager.Manager#resolveByType(javax.inject.TypeLiteral, + * @see javax.enterprise.inject.spi.BeanManager#getBeans(javax.enterprise.inject.TypeLiteral, * java.lang.annotation.Annotation[]) */ - public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> type, Annotation... bindings) + public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings) { return resolveByType(ResolvableAnnotatedClass.of(type, bindings), bindings); } @@ -546,7 +548,7 @@ { synchronized (beans) { - this.beans = new CopyOnWriteArrayList<Bean<?>>(beans); + this.beanWithManagers = new CopyOnWriteArrayList<Bean<?>>(beans); for (RIBean<?> bean : beans) { if (bean instanceof NewEnterpriseBean) @@ -591,7 +593,7 @@ */ public List<Bean<?>> getBeans() { - return Collections.unmodifiableList(beans); + return Collections.unmodifiableList(beanWithManagers); } public Map<String, RIBean<?>> getRiBeans() @@ -605,9 +607,9 @@ * @param context The context to add * @return A reference to the manager * - * @see javax.inject.manager.Manager#addContext(javax.context.Context) + * @see javax.enterprise.inject.spi.BeanManager#addContext(javax.enterprise.context.spi.Context) */ - public Manager addContext(Context context) + public BeanManager addContext(Context context) { contexts.put(context.getScopeType(), context); return this; @@ -616,12 +618,12 @@ /** * Registers a decorator with the manager * - * @param decorator The decorator to register + * @param abstractDecorator The decorator to register * @return A reference to the manager * - * @see javax.inject.manager.Manager#addDecorator(javax.inject.manager.Decorator) + * @see javax.enterprise.inject.spi.BeanManager#addDecorator(org.jboss.webbeans.bean.AbstractDecorator) */ - public Manager addDecorator(Decorator decorator) + public BeanManager addDecorator(Decorator abstractDecorator) { throw new UnsupportedOperationException("Not yet implemented"); } @@ -629,17 +631,17 @@ /** * Registers an interceptor with the manager * - * @param interceptor The interceptor to register + * @param abstractInterceptor The interceptor to register * @return A reference to the manager * - * @see javax.inject.manager.Manager#addInterceptor(javax.inject.manager.Interceptor) + * @see javax.enterprise.inject.spi.BeanManager#addInterceptor(org.jboss.webbeans.bean.AbstractInterceptor) */ - public Manager addInterceptor(Interceptor interceptor) + public BeanManager addInterceptor(Interceptor abstractInterceptor) { throw new UnsupportedOperationException("Not yet implemented"); } - public <T> Manager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) + public <T> BeanManager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) { return addObserverByType(observer, eventType, bindings); } @@ -651,12 +653,12 @@ * @param observer * @return */ - public <T> Manager addObserver(ObserverImpl<T> observer) + public <T> BeanManager addObserver(ObserverImpl<T> observer) { return addObserverByType(observer, observer.getEventType(), observer.getBindingsAsArray()); } - public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) + public <T> BeanManager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) { return addObserverByType(observer, eventType.getType(), bindings); } @@ -670,7 +672,7 @@ * @param bindings * @return */ - public <T> Manager addObserverByType(Observer<T> observer, Type eventType, Annotation... bindings) + public <T> BeanManager addObserverByType(Observer<T> observer, Type eventType, Annotation... bindings) { checkEventType(eventType); this.eventManager.addObserver(observer, eventType, bindings); @@ -687,7 +689,7 @@ * @param event The event object to pass along * @param bindings The binding types to match * - * @see javax.inject.manager.Manager#fireEvent(java.lang.Object, + * @see javax.enterprise.inject.spi.BeanManager#fireEvent(java.lang.Object, * java.lang.annotation.Annotation[]) */ public void fireEvent(Object event, Annotation... bindings) @@ -721,7 +723,7 @@ * @param scopeType The scope to match * @return A single active context of the given scope * - * @see javax.inject.manager.Manager#getContext(java.lang.Class) + * @see javax.enterprise.inject.spi.BeanManager#getContext(java.lang.Class) */ public Context getContext(Class<? extends Annotation> scopeType) { @@ -750,7 +752,7 @@ * @param bean The bean to instantiate * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstance(javax.inject.manager.Bean) + * @see javax.enterprise.inject.spi.BeanManager#getInstance(javax.inject.manager.Bean) */ public <T> T getInstance(Bean<T> bean) { @@ -775,10 +777,10 @@ * @param bean The bean to instantiate * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstance(javax.inject.manager.Bean) + * @see javax.enterprise.inject.spi.BeanManager#getInstance(javax.inject.manager.Bean) */ @SuppressWarnings("unchecked") - private <T> T getInstance(Bean<T> bean, CreationalContextImpl<T> creationalContext) + private <T> T getInstance(Bean<T> bean, CreationalContextImpl<?> creationalContext) { if (specializedBeans.containsKey(bean)) { @@ -788,7 +790,7 @@ { if (creationalContext != null || (creationalContext == null && getContext(bean.getScopeType()).get(bean) != null)) { - return clientProxyProvider.getClientProxy(this, bean); + return (T) clientProxyProvider.getClientProxy(this, bean); } else { @@ -797,13 +799,13 @@ } else { - return getContext(bean.getScopeType()).get(bean, creationalContext); + return getContext(bean.getScopeType()).get((Bean<T>)bean, (CreationalContext<T>)creationalContext); } } - public <T> T getInstanceToInject(InjectionPoint injectionPoint) + public Object getInstanceToInject(InjectionPoint injectionPoint) { - return this.<T> getInstanceToInject(injectionPoint, null); + return this.getInjectableReference(injectionPoint, null); } public void injectNonContextualInstance(Object instance) @@ -812,7 +814,7 @@ } @SuppressWarnings("unchecked") - public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> creationalContext) + public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> creationalContext) { boolean registerInjectionPoint = !injectionPoint.getType().equals(InjectionPoint.class); try @@ -821,11 +823,11 @@ { currentInjectionPoint.get().push(injectionPoint); } - AnnotatedItem<T, ?> element = ResolvableAnnotatedClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0])); - Bean<T> resolvedBean = getBeanByType(element, element.getBindingsAsArray()); + AnnotatedItem<?, ?> element = ResolvableAnnotatedClass.of(injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0])); + Bean<?> resolvedBean = getBeanByType(element, element.getBindingsAsArray()); if (getServices().get(MetaDataCache.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(injectionPoint.getType())) { - throw new UnproxyableDependencyException("Attempting to inject an unproxyable normal scoped bean " + resolvedBean + " into " + injectionPoint); + throw new UnproxyableResolutionException("Attempting to inject an unproxyable normal scoped bean " + resolvedBean + " into " + injectionPoint); } if (creationalContext instanceof CreationalContextImpl) { @@ -860,18 +862,18 @@ * @param name The name to match * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstanceByName(java.lang.String) + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByName(java.lang.String) */ public Object getInstanceByName(String name) { - Set<Bean<?>> beans = resolveByName(name); + Set<Bean<?>> beans = getBeans(name); if (beans.size() == 0) { return null; } else if (beans.size() > 1) { - throw new AmbiguousDependencyException("Resolved multiple Web Beans with " + name); + throw new AmbiguousResolutionException("Resolved multiple Web Beans with " + name); } else { @@ -886,7 +888,7 @@ * @param bindings The binding types to match * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstanceByType(java.lang.Class, + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByType(java.lang.Class, * java.lang.annotation.Annotation[]) */ public <T> T getInstanceByType(Class<T> type, Annotation... bindings) @@ -901,7 +903,7 @@ * @param bindings The binding types to match * @return An instance of the bean * - * @see javax.inject.manager.Manager#getInstanceByType(javax.inject.TypeLiteral, + * @see javax.enterprise.inject.spi.BeanManager#getInstanceByType(javax.enterprise.inject.TypeLiteral, * java.lang.annotation.Annotation[]) */ public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings) @@ -927,17 +929,17 @@ Set<Bean<T>> beans = resolveByType(element, bindings); if (beans.size() == 0) { - throw new UnsatisfiedDependencyException(element + "Unable to resolve any Web Beans"); + throw new UnsatisfiedResolutionException(element + "Unable to resolve any Web Beans"); } else if (beans.size() > 1) { - throw new AmbiguousDependencyException(element + "Resolved multiple Web Beans"); + throw new AmbiguousResolutionException(element + "Resolved multiple Web Beans"); } Bean<T> bean = beans.iterator().next(); boolean normalScoped = getServices().get(MetaDataCache.class).getScopeModel(bean.getScopeType()).isNormal(); if (normalScoped && !Beans.isBeanProxyable(bean)) { - throw new UnproxyableDependencyException("Normal scoped bean " + bean + " is not proxyable"); + throw new UnproxyableResolutionException("Normal scoped bean " + bean + " is not proxyable"); } return bean; } @@ -950,10 +952,10 @@ * @param bindings the binding types to match * @return A reference to the manager * - * @see javax.inject.manager.Manager#removeObserver(javax.event.Observer, + * @see javax.enterprise.inject.spi.BeanManager#removeObserver(javax.event.Observer, * java.lang.Class, java.lang.annotation.Annotation[]) */ - public <T> Manager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) + public <T> BeanManager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings) { this.eventManager.removeObserver(observer, eventType, bindings); return this; @@ -967,10 +969,10 @@ * @param bindings the binding types to match * @return A reference to the manager * - * @see javax.inject.manager.Manager#removeObserver(javax.event.Observer, - * javax.inject.TypeLiteral, java.lang.annotation.Annotation[]) + * @see javax.enterprise.inject.spi.BeanManager#removeObserver(javax.event.Observer, + * javax.enterprise.inject.TypeLiteral, java.lang.annotation.Annotation[]) */ - public <T> Manager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) + public <T> BeanManager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings) { this.eventManager.removeObserver(observer, eventType.getRawType(), bindings); return this; @@ -982,9 +984,9 @@ * @param The name to match * @return The set of matching beans * - * @see javax.inject.manager.Manager#resolveByName(java.lang.String) + * @see javax.enterprise.inject.spi.BeanManager#getBeans(java.lang.String) */ - public Set<Bean<?>> resolveByName(String name) + public Set<Bean<?>> getBeans(String name) { return resolver.get(name); } @@ -996,10 +998,10 @@ * @param bindings The binding types to match * @return A list of matching decorators * - * @see javax.inject.manager.Manager#resolveDecorators(java.util.Set, + * @see javax.enterprise.inject.spi.BeanManager#resolveDecorators(java.util.Set, * java.lang.annotation.Annotation[]) */ - public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindings) + public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindings) { throw new UnsupportedOperationException(); } @@ -1012,10 +1014,10 @@ * @param interceptorBindings The binding types to match * @return A list of matching interceptors * - * @see javax.inject.manager.Manager#resolveInterceptors(javax.inject.manager.InterceptionType, + * @see javax.enterprise.inject.spi.BeanManager#resolveInterceptors(javax.enterprise.inject.spi.InterceptionType, * java.lang.annotation.Annotation[]) */ - public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings) + public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings) { throw new UnsupportedOperationException(); } @@ -1047,7 +1049,7 @@ return buffer.toString(); } - public Manager parse(InputStream xmlStream) + public BeanManager parse(InputStream xmlStream) { throw new UnsupportedOperationException(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/WebBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; /** * Deployment type for Web Beans beans Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,15 +24,15 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.Specializes; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; import javax.event.Event; -import javax.inject.BindingType; import javax.inject.DefinitionException; -import javax.inject.Specializes; -import javax.inject.Standard; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; @@ -265,7 +265,7 @@ for (AnnotatedInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints()) { Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(BindingType.class); - Bean<?> resolvedBean = manager.resolveByType(injectionPoint.getRawType(), bindings).iterator().next(); + Bean<?> resolvedBean = manager.getBeans(injectionPoint.getRawType(), bindings).iterator().next(); if (passivating) { if (Dependent.class.equals(resolvedBean.getScopeType()) && !resolvedBean.isSerializable() && (((injectionPoint instanceof AnnotatedField) && !((AnnotatedField<?>) injectionPoint).isTransient()) || (injectionPoint instanceof AnnotatedParameter)) ) @@ -370,7 +370,7 @@ * * @return The set of binding types * - * @see javax.inject.manager.Bean#getBindings() + * @see org.jboss.webbeans.bean.BaseBean#getBindings() */ @Override public Set<Annotation> getBindings() @@ -393,7 +393,7 @@ * * @return The deployment type * - * @see javax.inject.manager.Bean#getDeploymentType() + * @see org.jboss.webbeans.bean.BaseBean#getDeploymentType() */ @Override public Class<? extends Annotation> getDeploymentType() @@ -422,7 +422,7 @@ * * @return The name * - * @see javax.inject.manager.Bean#getName() + * @see org.jboss.webbeans.bean.BaseBean#getName() */ @Override public String getName() @@ -435,7 +435,7 @@ * * @return The scope type * - * @see javax.inject.manager.Bean#getScopeType() + * @see org.jboss.webbeans.bean.BaseBean#getScopeType() */ @Override public Class<? extends Annotation> getScopeType() @@ -459,7 +459,7 @@ * * @return The set of API types * - * @see javax.inject.manager.Bean#getTypes() + * @see org.jboss.webbeans.bean.BaseBean#getTypes() */ @Override public Set<Type> getTypes() @@ -484,7 +484,7 @@ * * @return True if nullable, false otherwise * - * @see javax.inject.manager.Bean#isNullable() + * @see org.jboss.webbeans.bean.BaseBean#isNullable() */ @Override public boolean isNullable() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,17 +20,17 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.ScopeType; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.ScopeType; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.CreationException; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.deployment.Production; import javax.event.Observes; -import javax.inject.CreationException; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.Production; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Decorator.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,64 @@ +/* + * 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.bean; + +import java.lang.annotation.Annotation; +import java.util.Set; + +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Decorator; + + +/** + * The Bean object for a a decorator + * + * This interface should not be called directly by the application. + * + * @author Pete Muir + * + */ +public abstract class AbstractDecorator extends BaseBean<Object> implements Decorator<Object> +{ + + /** + * Create an interceptor bean + * + * @param beanManager + * the manager to create the interceptor for + */ + protected AbstractDecorator(BeanManager beanManager) + { + super(beanManager); + } + + /* (non-Javadoc) + * @see javax.enterprise.inject.spi.Decorator#getDelegateType() + */ + public abstract Class<?> getDelegateType(); + + /* (non-Javadoc) + * @see javax.enterprise.inject.spi.Decorator#getDelegateBindings() + */ + public abstract Set<Annotation> getDelegateBindings(); + + /* (non-Javadoc) + * @see javax.enterprise.inject.spi.Decorator#setDelegate(java.lang.Object, java.lang.Object) + */ + public abstract void setDelegate(Object instance, Object delegate); + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Interceptor.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,61 @@ +/* + * 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.bean; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Set; + +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InterceptionType; +import javax.enterprise.inject.spi.Interceptor; + + +/** + * The contract between the manager and a interceptor. + * + * This interface should not be called directly by the application. + * + * @author Pete Muir + * + */ +public abstract class AbstractInterceptor extends BaseBean<Object> implements Interceptor<Object> +{ + + /** + * Create an interceptor bean + * + * @param beanManager + * the manager to create the interceptor for + */ + protected AbstractInterceptor(BeanManager beanManager) + { + super(beanManager); + } + + /* (non-Javadoc) + * @see javax.inject.manager.Interceptor#getInterceptorBindingTypes() + */ + public abstract Set<Annotation> getInterceptorBindingTypes(); + + /* (non-Javadoc) + * @see javax.inject.manager.Interceptor#getMethod(javax.inject.manager.InterceptionType) + */ + public abstract Method getMethod(InterceptionType type); + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractInterceptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -28,15 +28,15 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.ScopeType; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.ScopeType; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.IllegalProductException; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; -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.bootstrap.BeanDeployerEnvironment; Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java (from rev 2700, ri/trunk/api/src/main/java/javax/inject/manager/Bean.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -0,0 +1,100 @@ +/* + * 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.bean; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; + +/** + * The contract between the manager and a bean. This interface + * should not be called directly by the application. + * + * @author Gavin King + * + * @param <T> an API type of the bean + */ +public abstract class BaseBean<T> implements Bean<T> +{ + private final BeanManager beanManager; + + /** + * Create an instance of a bean + * + * @param beanManager + */ + protected BaseBean(BeanManager beanManager) + { + this.beanManager = beanManager; + } + + /** + * Get the manager used to create this bean + * + * @return an instance of the manager + */ + protected BeanManager getManager() + { + return beanManager; + } + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getTypes() + */ + public abstract Set<Type> getTypes(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getBindings() + */ + public abstract Set<Annotation> getBindings(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getScopeType() + */ + public abstract Class<? extends Annotation> getScopeType(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getDeploymentType() + */ + public abstract Class<? extends Annotation> getDeploymentType(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getName() + */ + public abstract String getName(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#isSerializable() + */ + public abstract boolean isSerializable(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#isNullable() + */ + public abstract boolean isNullable(); + + /* (non-Javadoc) + * @see javax.inject.manager.Bean#getInjectionPoints() + */ + public abstract Set<InjectionPoint> getInjectionPoints(); + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/BaseBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,16 +24,16 @@ import java.util.List; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.context.ScopeType; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.ScopeType; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.spi.InjectionPoint; import javax.event.Observes; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,11 +26,11 @@ import javassist.util.proxy.ProxyFactory; import javassist.util.proxy.ProxyObject; -import javax.context.ApplicationScoped; -import javax.context.CreationalContext; import javax.decorator.Decorator; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.CreationException; import javax.event.Observes; -import javax.inject.CreationException; import javax.inject.DefinitionException; import javax.interceptor.Interceptor; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,10 +20,10 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; /** * A delegating bean @@ -32,17 +32,17 @@ * * @param <T> */ -public abstract class ForwardingBean<T> extends Bean<T> +public abstract class ForwardingBean<T> extends BaseBean<T> { /** * Constructor * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager */ - public ForwardingBean(Manager manager) + public ForwardingBean(BeanManager beanManager) { - super(manager); + super(beanManager); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Dependent; -import javax.inject.Standard; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Dependent; -import javax.inject.Standard; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.reflect.Field; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,11 +21,11 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.CreationException; +import javax.enterprise.inject.Disposes; import javax.event.Observes; -import javax.inject.CreationException; import javax.inject.DefinitionException; -import javax.inject.Disposes; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,9 +21,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import javax.context.Dependent; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; @@ -34,7 +33,7 @@ * * @author Pete Muir */ -public abstract class RIBean<T> extends Bean<T> +public abstract class RIBean<T> extends BaseBean<T> { private static final ConcurrentMap<String, AtomicInteger> ids = new ConcurrentHashMap<String, AtomicInteger>(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,9 +22,9 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.Initializer; import javax.inject.DefinitionException; -import javax.inject.Initializer; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -27,9 +27,9 @@ import javassist.util.proxy.ProxyFactory; import javassist.util.proxy.ProxyObject; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.Production; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.deployment.Production; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.RIBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/ConnectionContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.Connection; import javax.jms.JMSException; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.reflect.Method; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; import javax.jms.Connection; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageConsumerContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.MessageConsumer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/MessageProducerContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.MessageProducer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/SessionContextual.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.context.Contextual; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import javax.inject.ExecutionException; import javax.jms.JMSException; import javax.jms.Session; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import javassist.util.proxy.MethodHandler; -import javax.context.Context; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.Context; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.CreationalContextImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,8 +24,8 @@ import javassist.util.proxy.ProxyFactory; +import javax.enterprise.inject.spi.Bean; import javax.inject.DefinitionException; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.util.Proxies; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.DependentContext; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.Dependent; -import javax.inject.Standard; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.RIBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.TypeLiteral; import javax.event.Event; import javax.event.Fires; import javax.inject.Obtains; -import javax.inject.TypeLiteral; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.event.EventImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InjectionPointBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,9 +22,9 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.TypeLiteral; import javax.inject.Obtains; -import javax.inject.TypeLiteral; import org.jboss.webbeans.InstanceImpl; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/ManagerBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,15 +21,15 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Manager; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.ManagerImpl; public class ManagerBean extends AbstractStandardBean<ManagerImpl> { - private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(ManagerImpl.class, Manager.class)); + private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(ManagerImpl.class, BeanManager.class)); public static final ManagerBean of(ManagerImpl manager) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,14 +21,14 @@ import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.deployment.DeploymentType; import javax.event.Observes; -import javax.inject.BindingType; -import javax.inject.DeploymentType; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; import javax.inject.Realizes; -import javax.inject.UnsatisfiedDependencyException; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.AbstractClassBean; @@ -164,7 +164,7 @@ for(DisposalMethodBean<?> bean: all) { buff.append(bean.toString()); } - throw new UnsatisfiedDependencyException(buff.toString()); + throw new UnsatisfiedResolutionException(buff.toString()); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.annotation.Annotation; -import javax.context.Context; +import javax.enterprise.context.spi.Context; /** * Common Context operation @@ -57,7 +57,7 @@ * * @return The scope type * - * @see javax.context.Context#getScopeType() + * @see javax.enterprise.context.spi.Context#getScopeType() */ public Class<? extends Annotation> getScopeType() { @@ -69,7 +69,7 @@ * * @return The active state * - * @see javax.context.Context#isActive() + * @see javax.enterprise.context.spi.Context#isActive() */ public boolean isActive() { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,11 +19,11 @@ import java.lang.annotation.Annotation; import java.util.concurrent.locks.ReentrantLock; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; @@ -63,7 +63,7 @@ * @return An instance of the bean * @throws ContextNotActiveException if the context is not active * - * @see javax.context.Context#get(Bean, boolean) + * @see javax.enterprise.context.spi.Context#get(BaseBean, boolean) */ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextualInstance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.context; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** * A representation of a contextual bean plus associated instance Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.context; -import javax.context.ConversationScoped; +import javax.enterprise.context.ConversationScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,8 +19,8 @@ import java.util.HashMap; import java.util.Map; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; public class CreationalContextImpl<T> implements CreationalContext<T> { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,10 +24,10 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.context.ContextNotActiveException; -import javax.context.Contextual; -import javax.context.CreationalContext; -import javax.context.Dependent; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.context; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.context; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,7 +20,7 @@ import java.util.Enumeration; import java.util.List; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/BeanStoreNamingScheme.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.context.beanstore; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** * Interface against a BeanStore to handle different naming schemes Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/beanstore/PrefixBeanStoreNamingScheme.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.context.beanstore; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/AbstractConversationManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; -import javax.context.Conversation; -import javax.inject.Current; +import javax.enterprise.context.Conversation; +import javax.enterprise.inject.Current; import org.jboss.webbeans.context.ConversationContext; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import org.jboss.webbeans.context.ConversationContext; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,11 +16,11 @@ */ package org.jboss.webbeans.conversation; -import javax.annotation.Named; -import javax.context.Conversation; -import javax.context.RequestScoped; -import javax.inject.Initializer; -import javax.inject.Standard; +import javax.enterprise.context.Conversation; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Standard; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; @@ -29,7 +29,7 @@ * The current conversation implementation * * @author Nicklas Karlsson - * @see javax.context.Conversation + * @see javax.enterprise.context.Conversation */ @RequestScoped @Named("javax.context.conversation") Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.webbeans.WebBean; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,7 +19,7 @@ import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.webbeans.WebBean; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,8 +24,8 @@ import java.io.Serializable; -import javax.context.SessionScoped; -import javax.inject.Produces; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Produces; import javax.servlet.http.HttpSession; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; +import javax.enterprise.inject.Current; import javax.event.Observer; -import javax.inject.Current; import javax.inject.DuplicateBindingTypeException; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,19 +22,19 @@ import java.lang.reflect.WildcardType; import java.util.List; -import javax.context.Dependent; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; import javax.event.Asynchronously; import javax.event.IfExists; import javax.event.Observer; import javax.event.ObserverException; import javax.event.Observes; import javax.inject.DefinitionException; -import javax.inject.Disposes; -import javax.inject.Initializer; -import javax.inject.Produces; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.bean.RIBean; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.context.DependentInstancesStore; @@ -57,7 +57,7 @@ */ public class ObserverImpl<T> implements Observer<T> { - protected final Bean<?> observerBean; + protected final BaseBean<?> observerBean; protected final MethodInjectionPoint<?> observerMethod; private final boolean conditional; private final boolean asynchronous; @@ -73,7 +73,7 @@ * @param observerBean The observer bean * @param manager The Web Beans manager */ - protected ObserverImpl(final AnnotatedMethod<?> observer, final Bean<?> observerBean, final ManagerImpl manager) + protected ObserverImpl(final AnnotatedMethod<?> observer, final BaseBean<?> observerBean, final ManagerImpl manager) { this.manager = manager; this.observerBean = observerBean; @@ -206,7 +206,7 @@ manager.getTaskExecutor().execute(deferredEvent); } - private <B> B getInstance(Bean<B> observerBean) + private <B> B getInstance(BaseBean<B> observerBean) { return manager.getInstance(observerBean, !isConditional()); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -25,10 +25,10 @@ import javax.event.Asynchronously; import javax.event.BeforeTransactionCompletion; import javax.inject.DefinitionException; -import javax.inject.manager.Bean; import javax.transaction.Synchronization; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.transaction.spi.TransactionServices; @@ -72,7 +72,7 @@ * @param observerBean The bean declaring the observer method * @param manager The JCDI manager in use */ - protected TransactionalObserverImpl(AnnotatedMethod<?> observer, Bean<?> observerBean, ManagerImpl manager) + protected TransactionalObserverImpl(AnnotatedMethod<?> observer, BaseBean<?> observerBean, ManagerImpl manager) { super(observer, observerBean, manager); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/AnnotatedInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.injection; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.introspector.AnnotatedItem; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -27,8 +27,8 @@ import java.util.List; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedConstructor; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.reflect.InvocationTargetException; -import javax.inject.CreationException; +import javax.enterprise.inject.CreationException; import javax.inject.ExecutionException; class Exceptions Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,8 +22,8 @@ import java.lang.reflect.Field; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedField; @@ -73,7 +73,7 @@ { try { - delegate().set(declaringInstance, manager.getInstanceToInject(this, creationalContext)); + delegate().set(declaringInstance, manager.getInjectableReference(this, creationalContext)); } catch (IllegalArgumentException e) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,8 +26,8 @@ import java.util.List; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedMethod; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,13 +22,14 @@ import java.util.Set; import java.util.concurrent.Callable; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.Standard; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.deployment.Standard; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.context.ApplicationContext; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.resources.ClassTransformer; @@ -47,7 +48,7 @@ { this.instances = new ConcurrentCache<Class<?>, Set<FieldInjectionPoint<?>>>(); this.manager = manager; - nonContextualBean = new Bean<Object>(manager) + nonContextualBean = new BaseBean<Object>(manager) { @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.Member; import java.util.Set; -import javax.context.CreationalContext; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedParameter; @@ -77,9 +77,10 @@ throw new UnsupportedOperationException(); } + @SuppressWarnings("unchecked") public T getValueToInject(ManagerImpl manager, CreationalContext<?> creationalContext) { - return manager.<T>getInstanceToInject(this, creationalContext); + return (T) manager.getInjectableReference(this, creationalContext); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.jlr.AbstractAnnotatedItem; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/Resolver.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -26,8 +26,8 @@ import java.util.TreeSet; import java.util.concurrent.Callable; -import javax.inject.TypeLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.TypeLiteral; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.standard.EventBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Set; -import javax.annotation.Stereotype; -import javax.context.ScopeType; -import javax.inject.BindingType; -import javax.inject.DeploymentType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; /** * AnnotatedItem provides a uniform access to the annotations on an annotated Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -24,6 +24,7 @@ import java.util.List; import java.util.Set; +import javax.enterprise.inject.Disposes; import javax.event.AfterTransactionCompletion; import javax.event.AfterTransactionFailure; import javax.event.AfterTransactionSuccess; @@ -32,7 +33,6 @@ import javax.event.Fires; import javax.event.IfExists; import javax.event.Observes; -import javax.inject.Disposes; /** * AnnotatedType provides a uniform access to the annotations on an annotated Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.introspector; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; /** @@ -31,10 +31,10 @@ /** * Gets the actual value of the parameter from the manager * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager * @return The value */ - public T getValue(Manager manager); + public T getValue(BeanManager beanManager); public AnnotatedMember<?, ?> getDeclaringMember(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.util.collections.multi.SetHashMultiMap; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedParameter.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.introspector; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; public abstract class ForwardingAnnotatedParameter<T> extends ForwardingAnnotatedItem<T, Object> implements AnnotatedParameter<T> { @@ -29,9 +29,9 @@ return delegate().getDeclaringMember(); } - public T getValue(Manager manager) + public T getValue(BeanManager beanManager) { - return delegate().getValue(manager); + return delegate().getValue(beanManager); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import javax.inject.BindingType; -import javax.inject.manager.Manager; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.introspector.AnnotatedMember; import org.jboss.webbeans.introspector.AnnotationStore; @@ -103,12 +103,12 @@ /** * Gets the current value of the member * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager * @return The current value */ - public T getValue(Manager manager) + public T getValue(BeanManager beanManager) { - return manager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); + return beanManager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.inject.BindingType; -import javax.inject.manager.Manager; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.webbeans.introspector.AnnotatedMember; import org.jboss.webbeans.introspector.AnnotatedParameter; @@ -110,14 +110,14 @@ /** * Gets the current value * - * @param manager The Web Beans manager + * @param beanManager The Web Beans manager * @return the value * * @see org.jboss.webbeans.introspector.AnnotatedParameter */ - public T getValue(Manager manager) + public T getValue(BeanManager beanManager) { - return manager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); + return beanManager.getInstanceByType(getRawType(), getMetaAnnotationsAsArray(BindingType.class)); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/ConversationAwareViewHandler.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,10 +1,10 @@ package org.jboss.webbeans.jsf; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; +import javax.enterprise.inject.spi.BeanManager; import javax.faces.application.ViewHandler; import javax.faces.application.ViewHandlerWrapper; import javax.faces.context.FacesContext; -import javax.inject.manager.Manager; import org.jboss.webbeans.CurrentManager; @@ -51,8 +51,8 @@ public String getActionURL(FacesContext context, String viewId) { String actionUrl = super.getActionURL(context, viewId); - Manager manager = CurrentManager.rootManager(); - Conversation conversation = manager.getInstanceByType(Conversation.class); + BeanManager beanManager = CurrentManager.rootManager(); + Conversation conversation = beanManager.getInstanceByType(Conversation.class); if (conversation.isLongRunning()) { return new FacesUrlTransformer(actionUrl).appendConversationIdIfNecessary(conversation.getId()).getUrl(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/FacesUrlTransformer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.jsf; +import javax.enterprise.inject.AnnotationLiteral; import javax.faces.context.FacesContext; -import javax.inject.AnnotationLiteral; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.conversation.ConversationIdName; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.jsf; +import javax.enterprise.inject.AnnotationLiteral; import javax.faces.context.FacesContext; -import javax.inject.AnnotationLiteral; import javax.servlet.http.HttpSession; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -22,7 +22,7 @@ */ package org.jboss.webbeans.jsf; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/CurrentLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.Current; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Current; /** * Annotation literal for @Current Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/DeployedLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,15 +16,15 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Deployed; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.AfterBeanDiscovery; /** * Annotation literal for @Deployed * * @author Nicklas Karlsson */ -public class DeployedLiteral extends AnnotationLiteral<Deployed> implements Deployed +public class DeployedLiteral extends AnnotationLiteral<AfterBeanDiscovery> implements AfterBeanDiscovery { } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/FiresLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.literal; +import javax.enterprise.inject.AnnotationLiteral; import javax.event.Fires; -import javax.inject.AnnotationLiteral; public class FiresLiteral extends AnnotationLiteral<Fires> implements Fires { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/InitializedLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,15 +16,15 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Initialized; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; /** * Annotation literal for @Initialized * * @author Pete Muir */ -public class InitializedLiteral extends AnnotationLiteral<Initialized> implements Initialized +public class InitializedLiteral extends AnnotationLiteral<BeforeBeanDiscovery> implements BeforeBeanDiscovery { } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; -import javax.inject.New; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.New; /** * Annotation literal for @Current Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/ObtainsLiteral.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.literal; -import javax.inject.AnnotationLiteral; +import javax.enterprise.inject.AnnotationLiteral; import javax.inject.Obtains; public class ObtainsLiteral extends AnnotationLiteral<Obtains> implements Obtains Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.Set; -import javax.annotation.NonBinding; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.NonBinding; import javax.inject.DefinitionException; import javax.inject.ExecutionException; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/ScopeModel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.lang.annotation.Annotation; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; import org.jboss.webbeans.resources.ClassTransformer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,12 +21,12 @@ import java.util.HashSet; import java.util.Set; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ScopeType; -import javax.inject.BindingType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; import javax.interceptor.InterceptorBindingType; import org.jboss.webbeans.resources.ClassTransformer; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -18,7 +18,7 @@ import java.io.IOException; -import javax.context.Conversation; +import javax.enterprise.context.Conversation; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,8 +16,8 @@ */ package org.jboss.webbeans.servlet; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; import javax.servlet.http.HttpSession; import org.jboss.webbeans.WebBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,10 +19,10 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.Bean; import javax.inject.DefinitionException; -import javax.inject.Produces; -import javax.inject.manager.Bean; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.EnterpriseBean; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; import javax.inject.ExecutionException; import org.jboss.webbeans.util.reflection.ParameterizedTypeImpl; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -37,12 +37,9 @@ import org.dom4j.Namespace; import org.dom4j.QName; import org.dom4j.io.SAXReader; -import org.jboss.webbeans.bootstrap.api.ServiceRegistry; import org.jboss.webbeans.introspector.AnnotatedClass; -import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; import org.jboss.webbeans.resources.ClassTransformer; -import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.resources.spi.ResourceLoadingException; import org.xml.sax.SAXException; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -28,11 +28,11 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.DeploymentType; import javax.inject.DefinitionException; import javax.inject.DeploymentException; -import javax.inject.DeploymentType; import javax.interceptor.InterceptorBindingType; import org.dom4j.Document; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -23,17 +23,17 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; import javax.annotation.Resource; -import javax.annotation.Stereotype; -import javax.context.ScopeType; import javax.decorator.Decorator; import javax.ejb.EJB; -import javax.inject.BindingType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.deployment.Specializes; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; import javax.inject.Realizes; -import javax.inject.Specializes; import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBindingType; import javax.persistence.PersistenceContext; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/ext/ResourceElementRegistrator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -25,8 +25,8 @@ import javax.annotation.Resource; import javax.ejb.EJB; -import javax.inject.Current; -import javax.inject.DeploymentType; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.deployment.DeploymentType; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceUnit; import javax.xml.ws.WebServiceRef; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -23,11 +23,11 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Named; -import javax.annotation.Stereotype; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; import javax.inject.DefinitionException; -import javax.inject.DeploymentType; import org.dom4j.Element; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/impl/src/main/resources/ee/namespace =================================================================== --- ri/trunk/impl/src/main/resources/ee/namespace 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/impl/src/main/resources/ee/namespace 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,11 @@ java.lang java.util javax.annotation -javax.inject +javax.enterprise.inject +javax.enterprise.context +javax.enterprise.context.spi +javax.enterprise.inject.spi +javax.enterprise.inject.deployment javax.context javax.interceptor javax.decorator Modified: ri/trunk/osgi-bundle/pom.xml =================================================================== --- ri/trunk/osgi-bundle/pom.xml 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/osgi-bundle/pom.xml 2009-05-26 12:45:33 UTC (rev 2711) @@ -54,7 +54,7 @@ <instructions> <_include>-osgi.bundle</_include> <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> - <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.inject.manager; version=${osgi.version}, + <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.inject.spi; version=${osgi.version}, org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version}, org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version}, org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version}, Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; import org.jboss.jsr299.tck.spi.Managers; import org.jboss.webbeans.CurrentManager; @@ -13,7 +13,7 @@ public class ManagersImpl implements Managers { - public Manager getManager() + public BeanManager getManager() { return CurrentManager.rootManager(); } Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/BeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -17,7 +17,7 @@ package org.jboss.webbeans.context.api; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,8 +3,7 @@ import java.util.Map; import java.util.Set; -import javax.context.Contextual; -import javax.inject.manager.Bean; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.context.api.BeanStore; @@ -24,7 +23,7 @@ * @param The bean to look for * @return An instance, if found * - * @see org.jboss.webbeans.context.api.BeanStore#get(Bean) + * @see org.jboss.webbeans.context.api.BeanStore#get(BaseBean) */ public <T extends Object> T get(Contextual<? extends T> bean) { @@ -39,7 +38,7 @@ * @param bean the bean to remove * @return The instance removed * - * @see org.jboss.webbeans.context.api.BeanStore#remove(Bean) + * @see org.jboss.webbeans.context.api.BeanStore#remove(BaseBean) */ public <T extends Object> T remove(Contextual<? extends T> bean) { @@ -76,7 +75,7 @@ * @param bean The bean * @param instance the instance * - * @see org.jboss.webbeans.context.api.BeanStore#put(Bean, Object) + * @see org.jboss.webbeans.context.api.BeanStore#put(BaseBean, Object) */ public <T> void put(Contextual<? extends T> bean, T instance) { Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -21,7 +21,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; /** * A BeanStore that uses a HashMap as backing storage Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.context.api.helpers; -import javax.context.Contextual; +import javax.enterprise.context.spi.Contextual; import org.jboss.webbeans.context.api.BeanStore; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -17,7 +17,7 @@ package org.jboss.webbeans.ejb.spi; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.bootstrap.api.Service; import org.jboss.webbeans.ejb.api.SessionObjectReference; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.ejb.spi.helpers; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ejb.api.SessionObjectReference; import org.jboss.webbeans.ejb.spi.EjbDescriptor; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/manager/api/WebBeansManager.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -19,7 +19,7 @@ import java.io.Serializable; -import javax.inject.manager.Manager; +import javax.enterprise.inject.spi.BeanManager; /** * Functionality provided by the Web Beans Manager over and above the JSR-299 @@ -28,7 +28,7 @@ * @author Pete Muir * */ -public interface WebBeansManager extends Manager, Serializable +public interface WebBeansManager extends BeanManager, Serializable { /** Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/JpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.persistence.spi; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardingJpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.persistence.spi.helpers; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/ResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.resources.spi; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.bootstrap.api.Service; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/AbstractResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -5,8 +5,8 @@ import java.lang.reflect.Method; import javax.annotation.Resource; +import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.ExecutionException; -import javax.inject.manager.InjectionPoint; import javax.naming.Context; import javax.naming.NamingException; Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.resources.spi.helpers; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.resources.spi.ResourceServices; Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.bootstrap.api.test; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.ejb.api.SessionObjectReference; import org.jboss.webbeans.ejb.spi.EjbDescriptor; Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.Collection; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.bootstrap.api.test; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.resources.spi.ResourceServices; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.lang.reflect.Field; import java.util.Collection; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.ejb.api.SessionObjectReference; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -7,7 +7,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import javax.persistence.Entity; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.mock; -import javax.inject.manager.InjectionPoint; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.webbeans.resources.spi.ResourceServices; Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Production; -import javax.inject.Standard; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; import org.jboss.testharness.AbstractTest; import org.jboss.webbeans.CurrentManager; Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -5,10 +5,10 @@ import java.util.List; import java.util.Set; -import javax.context.Context; -import javax.context.CreationalContext; -import javax.context.RequestScoped; -import javax.inject.manager.Bean; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -47,7 +47,7 @@ public void testCreateSFSB() { GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); - Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next(); + Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>(); KleinStadt stadtInstance = stadtBean.create(creationalContext); @@ -75,7 +75,7 @@ public void testDestroyRemovesSFSB() throws Exception { GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class); - Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next(); + Bean<KleinStadt> stadtBean = getCurrentManager().getBeans(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; Context requestContext = getCurrentManager().getContext(RequestScoped.class); CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>(); Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; @Stateful @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,10 +2,10 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import javax.context.RequestScoped; import javax.ejb.EJB; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; @Stateful @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,10 +1,10 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; import javax.annotation.PreDestroy; -import javax.context.Dependent; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Current; @Stateful @Dependent Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import javax.annotation.PostConstruct; import javax.ejb.Stateless; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; @Stateless public class Mainz implements AlteStadt Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Current; +import javax.enterprise.inject.Current; @Stateful public class Marburg implements UniStadt Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.context.CreationalContext; +import javax.enterprise.context.spi.CreationalContext; public class MockCreationalContext<T> implements CreationalContext<T> { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.examples; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class Game { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.examples; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped public class Generator { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Mock.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.examples; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class TextTranslator { private SentenceParser sentenceParser; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Cow.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped class Cow implements Animal Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserver.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,15 +1,15 @@ package org.jboss.webbeans.test.unit.bootstrap; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class InitializedObserver { public static boolean observered; - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { observered = true; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesApplicationContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,16 +1,16 @@ package org.jboss.webbeans.test.unit.bootstrap; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class InitializedObserverWhichUsesApplicationContext { @Current Cow cow; - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { cow.moo(); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InitializedObserverWhichUsesRequestContext.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.bootstrap; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.event.Observes; -import javax.inject.Current; -import javax.inject.manager.Initialized; -import javax.inject.manager.Manager; class InitializedObserverWhichUsesRequestContext { @@ -12,7 +12,7 @@ @Current Tuna tuna; - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes @BeforeBeanDiscovery BeanManager beanManager) { name = tuna.getName(); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/XmlBootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap; -import javax.inject.Production; -import javax.inject.Standard; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.inject.AnnotationLiteral; -import javax.inject.manager.Bean; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.annotation.Named; import javax.ejb.EJB; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class TarantulaProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.environments; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.bean.RIBean; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.context.RequestScoped; -import javax.inject.Production; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.deployment.Production; @Production @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.annotation.Named; -import javax.inject.Production; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.deployment.Production; @Production @Whitefish Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.multipleSimple; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise; -import javax.annotation.Named; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.inject.Named; @Stateful @Tame Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class TarantulaProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,9 +4,10 @@ import java.util.List; import java.util.Map; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.bean.RIBean; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.bootstrap.singleSimple; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; @RequestScoped class Tuna Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; @ApplicationScoped public class ApplictionScopedObject Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,8 +3,8 @@ import java.util.Arrays; import java.util.List; -import javax.context.RequestScoped; -import javax.inject.Produces; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; public class ParameterizedTypeScoped { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.context; -import javax.context.ApplicationScoped; -import javax.context.ConversationScoped; -import javax.context.RequestScoped; -import javax.context.SessionScoped; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.ConversationScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.SessionScoped; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.metadata.MetaDataCache; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE, METHOD, FIELD }) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.definition; -import javax.annotation.Named; +import javax.enterprise.inject.Named; public @Named Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.definition; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; public class BeerProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.definition; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Order Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Stereotype; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.Arrays; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.metadata.StereotypeModel; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.inject.New; +import javax.enterprise.inject.New; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; @@ -28,13 +28,13 @@ public void initNewBean() { - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).size() == 1; - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof EnterpriseBean; - wrappedEnterpriseBean = (EnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class).iterator().next(); + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).size() == 1; + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof EnterpriseBean; + wrappedEnterpriseBean = (EnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next(); - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewEnterpriseBean; - newEnterpriseBean = (NewEnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1; + assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewEnterpriseBean; + newEnterpriseBean = (NewEnterpriseBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next(); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.implementation; -import javax.annotation.Named; -import javax.context.SessionScoped; import javax.ejb.Remove; import javax.ejb.Stateful; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Stateful Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.Set; -import javax.annotation.Stereotype; -import javax.inject.DeploymentType; -import javax.inject.Production; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.deployment.DeploymentType; +import javax.enterprise.inject.deployment.Production; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.introspector.AnnotatedClass; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.implementation.annotatedItem; -import javax.inject.Production; +import javax.enterprise.inject.deployment.Production; @Production class Order Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/sbi/SessionBeanInterceptorTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,9 +1,9 @@ package org.jboss.webbeans.test.unit.implementation.event; +import javax.enterprise.inject.AnnotationLiteral; import javax.event.Event; import javax.event.Fires; import javax.event.Observes; -import javax.inject.AnnotationLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.ManagerImpl; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @BindingType @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.implementation.exceptions; -import javax.inject.AnnotationLiteral; -import javax.inject.CreationException; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.CreationException; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.implementation.exceptions; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class ShipProducer_Broken { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.New; +import javax.enterprise.inject.New; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.bean.NewSimpleBean; @@ -22,13 +22,13 @@ public void initNewBean() { - assert getCurrentManager().resolveByType(WrappedSimpleBean.class).size() == 1; - assert getCurrentManager().resolveByType(WrappedSimpleBean.class).iterator().next() instanceof SimpleBean; - wrappedSimpleBean = (SimpleBean<WrappedSimpleBean>) getCurrentManager().resolveByType(WrappedSimpleBean.class).iterator().next(); + assert getCurrentManager().getBeans(WrappedSimpleBean.class).size() == 1; + assert getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next() instanceof SimpleBean; + wrappedSimpleBean = (SimpleBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class).iterator().next(); - assert getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).size() == 1; - assert getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewSimpleBean; - newSimpleBean = (NewSimpleBean<WrappedSimpleBean>) getCurrentManager().resolveByType(WrappedSimpleBean.class, NEW_LITERAL).iterator().next(); + assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).size() == 1; + assert getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next() instanceof NewSimpleBean; + newSimpleBean = (NewSimpleBean<WrappedSimpleBean>) getCurrentManager().getBeans(WrappedSimpleBean.class, NEW_LITERAL).iterator().next(); } @Test(groups = { "new" }) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.SessionScoped; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Named; @SessionScoped @Named("Fred") Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class IntegerCollectionInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; public class ListInstance Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Instance; +import javax.enterprise.inject.Instance; import javax.inject.Obtains; public class ListStringInstance Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class NoParameterizedCollectionInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class ParameterizedCollectionInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.List; -import javax.inject.Current; -import javax.inject.Initializer; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Initializer; public class ParameterizedListInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; public class ParameterizedProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.TypeLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.test.AbstractWebBeansTest; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class IntInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,14 +1,14 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.inject.Current; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.inject.Current; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; class ManagerProducer { - @Current Manager manager; + @Current BeanManager beanManager; private static boolean injectionPointInjected; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.implementation.producer.method; -import javax.annotation.Named; -import javax.inject.Produces; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; public class NamedProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.annotation.Named; -import javax.context.RequestScoped; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Named; @Named @RequestScoped Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,8 +2,8 @@ import java.util.List; -import javax.inject.Instance; -import javax.inject.TypeLiteral; +import javax.enterprise.inject.Instance; +import javax.enterprise.inject.TypeLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.webbeans.literal.ObtainsLiteral; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Air.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class Air Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Bar Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bird.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class Bird Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Car.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.inject.Current; +import javax.enterprise.inject.Current; class Car { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class DependentLoopingProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Produces; +import javax.enterprise.inject.Produces; class DependentSelfConsumingDependentProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingNormalProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; class DependentSelfConsumingNormalProducer { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Farm { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Fish { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.inject.Current; +import javax.enterprise.inject.Current; class Foo { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Food.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Food Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/House.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class House Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped class NormalLoopingProducer Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingDependentProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped class NormalSelfConsumingDependentProducer Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalSelfConsumingNormalProducer.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; @ApplicationScoped class NormalSelfConsumingNormalProducer Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Petrol.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Petrol Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Pig.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test.unit.lookup.circular; import javax.annotation.PostConstruct; -import javax.context.ApplicationScoped; -import javax.inject.Current; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Current; @ApplicationScoped class Pig Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Planet.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Planet { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent1.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingNormal1.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Space.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.context.ApplicationScoped; -import javax.inject.Initializer; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Initializer; @ApplicationScoped class Space Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.lookup.circular; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; class Water { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,16 +6,16 @@ import java.util.HashSet; import java.util.Set; -import javax.context.CreationalContext; -import javax.context.Dependent; -import javax.inject.Production; -import javax.inject.manager.Bean; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.BaseBean; import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -34,7 +34,7 @@ private static interface Dummy {} - private static class DummyBean extends Bean<Dummy> + private static class DummyBean extends BaseBean<Dummy> { private static final Set<Type> TYPES = new HashSet<Type>(); @@ -45,9 +45,9 @@ TYPES.add(Object.class); } - protected DummyBean(Manager manager) + protected DummyBean(BeanManager beanManager) { - super(manager); + super(beanManager); } @Override @@ -116,23 +116,23 @@ Integer rootManagerId = getCurrentManager().getId(); ManagerImpl deserializedRootManager = (ManagerImpl) deserialize(serialize(getCurrentManager())); assert deserializedRootManager.getId().equals(rootManagerId); - assert getCurrentManager().resolveByType(Foo.class).size() == 1; - assert deserializedRootManager.resolveByType(Foo.class).size() == 1; - assert getCurrentManager().resolveByType(Foo.class).iterator().next().equals(deserializedRootManager.resolveByType(Foo.class).iterator().next()); + assert getCurrentManager().getBeans(Foo.class).size() == 1; + assert deserializedRootManager.getBeans(Foo.class).size() == 1; + assert getCurrentManager().getBeans(Foo.class).iterator().next().equals(deserializedRootManager.getBeans(Foo.class).iterator().next()); } @Test public void testChildManagerSerializability() throws Exception { ManagerImpl childManager = getCurrentManager().createActivity(); - Bean<?> dummyBean = new DummyBean(childManager); + BaseBean<?> dummyBean = new DummyBean(childManager); childManager.addBean(dummyBean); Integer childManagerId = childManager.getId(); ManagerImpl deserializedChildManager = (ManagerImpl) deserialize(serialize(childManager)); assert deserializedChildManager.getId().equals(childManagerId); - assert childManager.resolveByType(Dummy.class).size() == 1; - assert deserializedChildManager.resolveByType(Dummy.class).size() == 1; - assert childManager.resolveByType(Dummy.class).iterator().next().equals(deserializedChildManager.resolveByType(Dummy.class).iterator().next()); + assert childManager.getBeans(Dummy.class).size() == 1; + assert deserializedChildManager.getBeans(Dummy.class).size() == 1; + assert childManager.getBeans(Dummy.class).iterator().next().equals(deserializedChildManager.getBeans(Dummy.class).iterator().next()); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,7 +1,7 @@ package org.jboss.webbeans.test.unit.xml.beans; -import javax.context.RequestScoped; -import javax.inject.Initializer; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Initializer; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestBindingType; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestDeploymentType; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestBindingType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.inject.BindingType; +import javax.enterprise.inject.BindingType; @BindingType public @interface TestBindingType Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @DeploymentType public @interface TestDeploymentType Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestNamed.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.annotation.Named; +import javax.enterprise.inject.Named; @Named public @interface TestNamed Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestScopeType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.context.ScopeType; +import javax.enterprise.context.ScopeType; @ScopeType public @interface TestScopeType Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/annotationtype/TestStereotype.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.beans.annotationtype; -import javax.annotation.Stereotype; +import javax.enterprise.inject.Stereotype; @Stereotype public @interface TestStereotype Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -3,9 +3,9 @@ import java.net.URL; import java.util.Iterator; +import javax.enterprise.inject.deployment.Production; +import javax.enterprise.inject.deployment.Standard; import javax.inject.DefinitionException; -import javax.inject.Production; -import javax.inject.Standard; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -15,6 +15,6 @@ @Test public void testJavaEePkg() { - assert getCurrentManager().resolveByType(Order.class).size() == 2; + assert getCurrentManager().getBeans(Order.class).size() == 2; } } \ No newline at end of file Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -2,12 +2,12 @@ import java.util.Date; -import javax.annotation.Named; -import javax.context.RequestScoped; import javax.ejb.ScheduleExpression; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Named; +import javax.enterprise.inject.Produces; import javax.event.Event; -import javax.inject.Initializer; -import javax.inject.Produces; import javax.interceptor.InvocationContext; import javax.jms.Connection; import javax.persistence.EntityManager; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/AnotherDeploymentType.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.DeploymentType; +import javax.enterprise.inject.deployment.DeploymentType; @Target( { TYPE, METHOD }) @Retention(RUNTIME) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import javax.inject.manager.Bean; +import javax.enterprise.inject.spi.Bean; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; @@ -21,7 +21,6 @@ import org.jboss.webbeans.test.unit.xml.beans.Order; import org.jboss.webbeans.xml.XmlEnvironment; import org.jboss.webbeans.xml.XmlParser; -import org.testng.annotations.Test; @Artifact @Resources({ @@ -67,7 +66,7 @@ ManagerImpl manager = parserEnv.getManager(); - Set<Bean<Order>> beansSet = manager.resolveByType(Order.class); + Set<Bean<Order>> beansSet = manager.getBeans(Order.class); List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes(); dTypes.size(); for(Bean<Order> bean : beansSet) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -35,7 +35,7 @@ XmlParser parser = new XmlParser(parserEnv); parser.parse(); - assert parserEnv.getManager().resolveByType(Order.class).size() == 1; + assert parserEnv.getManager().getBeans(Order.class).size() == 1; } @Test(expectedExceptions = DefinitionException.class) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.xml.parser.schema.foo; -import javax.inject.Initializer; +import javax.enterprise.inject.Initializer; public class Order { Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-05-25 16:56:19 UTC (rev 2710) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-05-26 12:45:33 UTC (rev 2711) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.parser" - xmlns:manager="urn:java:javax.inject.manager" + xmlns:manager="urn:java:javax.enterprise.inject.spi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser"> <Deploy>

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2710 - examples/trunk/se/numberguess.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-05-25 12:56:19 -0400 (Mon, 25 May 2009) New Revision: 2710 Modified: examples/trunk/se/numberguess/pom.xml Log: added webbeans-core as runtime dependency Modified: examples/trunk/se/numberguess/pom.xml =================================================================== --- examples/trunk/se/numberguess/pom.xml 2009-05-25 16:55:34 UTC (rev 2709) +++ examples/trunk/se/numberguess/pom.xml 2009-05-25 16:56:19 UTC (rev 2710) @@ -17,53 +17,58 @@ <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-se</artifactId> </dependency> + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> - <profiles> - <profile> - <id>run</id> - <activation> - <property> - <name>run</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <executions> - <execution> - <id>run</id> - <phase>package</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>run</id> + <activation> + <property> + <name>run</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <executions> + <execution> + <id>run</id> + <phase>package</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <configuration> + <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2709 - examples/trunk/se/hello-world.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-05-25 12:55:34 -0400 (Mon, 25 May 2009) New Revision: 2709 Modified: examples/trunk/se/hello-world/pom.xml Log: uses version from versioning matrix Modified: examples/trunk/se/hello-world/pom.xml =================================================================== --- examples/trunk/se/hello-world/pom.xml 2009-05-25 16:54:44 UTC (rev 2708) +++ examples/trunk/se/hello-world/pom.xml 2009-05-25 16:55:34 UTC (rev 2709) @@ -83,7 +83,6 @@ <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-core</artifactId> - <version>1.0.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> </dependencies>

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2708 - examples/trunk/se/hello-world.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-05-25 12:54:44 -0400 (Mon, 25 May 2009) New Revision: 2708 Modified: examples/trunk/se/hello-world/pom.xml Log: Added webbeans-core as runtime dependency Modified: examples/trunk/se/hello-world/pom.xml =================================================================== --- examples/trunk/se/hello-world/pom.xml 2009-05-25 16:46:57 UTC (rev 2707) +++ examples/trunk/se/hello-world/pom.xml 2009-05-25 16:54:44 UTC (rev 2708) @@ -80,6 +80,12 @@ <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-se</artifactId> </dependency> + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <version>1.0.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> </dependencies> </project>

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2707 - in extensions/trunk/se: src/main/java/org/jboss/webbeans/environment/se and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-05-25 12:46:57 -0400 (Mon, 25 May 2009) New Revision: 2707 Modified: extensions/trunk/se/pom.xml extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java Log: Cleaned up dependencies - webbeans core now scoped as 'provided'. Modified: extensions/trunk/se/pom.xml =================================================================== --- extensions/trunk/se/pom.xml 2009-05-25 15:54:31 UTC (rev 2706) +++ extensions/trunk/se/pom.xml 2009-05-25 16:46:57 UTC (rev 2707) @@ -50,27 +50,24 @@ <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-spi</artifactId> - </dependency> -  - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> <exclusions> <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> </exclusions> </dependency> - + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-logger</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <version>1.0.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> </dependencies> <scm> Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-25 15:54:31 UTC (rev 2706) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-25 16:46:57 UTC (rev 2707) @@ -21,7 +21,6 @@ import org.jboss.webbeans.bootstrap.api.Bootstrap; import org.jboss.webbeans.bootstrap.api.Environments; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore; import org.jboss.webbeans.environment.se.discovery.SEWebBeanDiscovery; @@ -65,7 +64,6 @@ bootstrap.initialize(); this.manager = bootstrap.getManager(); bootstrap.boot(); - DependentContext.instance().setActive(true); bootstrap.getManager().getInstanceByType(ShutdownManager.class).setBootstrap(bootstrap); }

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2706 - extensions/trunk/se.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-05-25 11:54:31 -0400 (Mon, 25 May 2009) New Revision: 2706 Modified: extensions/trunk/se/pom.xml Log: XML formatting Modified: extensions/trunk/se/pom.xml =================================================================== --- extensions/trunk/se/pom.xml 2009-05-25 15:53:52 UTC (rev 2705) +++ extensions/trunk/se/pom.xml 2009-05-25 15:54:31 UTC (rev 2706) @@ -1,82 +1,82 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>webbeans-parent</artifactId> - <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-se</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Web Beans SE Module</name> - <url>http://maven.apache.org</url> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/webbeans/extensions/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - </build> + <parent> + <artifactId>webbeans-parent</artifactId> + <groupId>org.jboss.webbeans</groupId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-se</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Web Beans SE Module</name> + <url>http://maven.apache.org</url> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/webbeans/extensions/tags</tagBase> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-spi</artifactId> - </dependency> + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-spi</artifactId> + </dependency>  - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> - </dependencies> + </dependencies> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/extensions</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/extensions</developerConnection> - <url>http://fisheye.jboss.org/browse/WebBeans/extensions</url> - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/extensions</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/extensions</developerConnection> + <url>http://fisheye.jboss.org/browse/WebBeans/extensions</url> + </scm> </project>

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2705 - extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-05-25 11:53:52 -0400 (Mon, 25 May 2009) New Revision: 2705 Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java Log: Brace Formatting Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-25 11:18:14 UTC (rev 2704) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-05-25 15:53:52 UTC (rev 2705) @@ -39,62 +39,56 @@ */ public class StartMain { - - private static final String BOOTSTRAP_IMPL_CLASS_NAME = "org.jboss.webbeans.bootstrap.WebBeansBootstrap"; - - private final Bootstrap bootstrap; - private final BeanStore applicationBeanStore; - public static String[] PARAMETERS; - - private WebBeansManager manager; - - - public StartMain(String[] commandLineArgs) - { - PARAMETERS = commandLineArgs; - try - { - bootstrap = Reflections.newInstance(BOOTSTRAP_IMPL_CLASS_NAME, Bootstrap.class); - } - catch (Exception e) - { - throw new IllegalStateException("Error loading Web Beans bootstrap, check that Web Beans is on the classpath", e); - } - this.applicationBeanStore = new ConcurrentHashMapBeanStore(); - } - - private void go() - { - bootstrap.setEnvironment(Environments.SE); - bootstrap.getServices().add(WebBeanDiscovery.class, new SEWebBeanDiscovery() {}); - bootstrap.setApplicationContext(applicationBeanStore); - bootstrap.initialize(); - this.manager = bootstrap.getManager(); - bootstrap.boot(); - DependentContext.instance().setActive(true); - bootstrap.getManager().getInstanceByType(ShutdownManager.class).setBootstrap(bootstrap); - } - - /** - * The main method called from the command line. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) - { - new StartMain(args).main(); - } - - public Manager main() - { - go(); - return manager; - } - public static String[] getParameters() { - // TODO(PR): make immutable - return PARAMETERS; - } + private static final String BOOTSTRAP_IMPL_CLASS_NAME = "org.jboss.webbeans.bootstrap.WebBeansBootstrap"; + private final Bootstrap bootstrap; + private final BeanStore applicationBeanStore; + public static String[] PARAMETERS; + private WebBeansManager manager; + public StartMain(String[] commandLineArgs) + { + PARAMETERS = commandLineArgs; + try { + bootstrap = Reflections.newInstance(BOOTSTRAP_IMPL_CLASS_NAME, Bootstrap.class); + } catch (Exception e) { + throw new IllegalStateException("Error loading Web Beans bootstrap, check that Web Beans is on the classpath", e); + } + this.applicationBeanStore = new ConcurrentHashMapBeanStore(); + } + + private void go() + { + bootstrap.setEnvironment(Environments.SE); + bootstrap.getServices().add(WebBeanDiscovery.class, new SEWebBeanDiscovery() {}); + bootstrap.setApplicationContext(applicationBeanStore); + bootstrap.initialize(); + this.manager = bootstrap.getManager(); + bootstrap.boot(); + DependentContext.instance().setActive(true); + bootstrap.getManager().getInstanceByType(ShutdownManager.class).setBootstrap(bootstrap); + } + + /** + * The main method called from the command line. + * + * @param args + * the command line arguments + */ + public static void main(String[] args) + { + new StartMain(args).main(); + } + + public Manager main() + { + go(); + return manager; + } + + public static String[] getParameters() + { + // TODO(PR): make immutable + return PARAMETERS; + } }

14 years, 11 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2704 - ri/trunk/osgi-bundle.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-05-25 07:18:14 -0400 (Mon, 25 May 2009) New Revision: 2704 Modified: ri/trunk/osgi-bundle/ Log: Added Eclipse .project file to ignore list. Property changes on: ri/trunk/osgi-bundle ___________________________________________________________________ Name: svn:ignore - target .settings .classpath + target .settings .classpath

14 years, 11 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits May 2009