openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r738223 [2/3] - in /incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test: annotation/binding/ annotation/deployment/ component/ component/binding/ component/decorator/broken/ component/decorator/clean/ component...
Date Tue, 27 Jan 2009 20:19:26 GMT
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.event.broken;
 
-import javax.webbeans.Disposes;
-import javax.webbeans.Observes;
-import javax.webbeans.Production;
+import javax.event.Observes;
+import javax.inject.Disposes;
+import javax.inject.Production;
 
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.webbeans.test.component.CurrentBindingComponent;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObservable1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObservable1.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObservable1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObservable1.java Tue Jan 27 20:19:20 2009
@@ -15,11 +15,11 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.webbeans.Current;
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.inject.Current;
+import javax.inject.Production;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
 import org.apache.webbeans.test.event.LoggedInEvent;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java Tue Jan 27 20:19:20 2009
@@ -13,10 +13,10 @@
  */
 package org.apache.webbeans.test.component.event.normal;
 
-import javax.webbeans.Current;
-import javax.webbeans.Observes;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.event.Observes;
+import javax.inject.Current;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Check;
 import org.apache.webbeans.test.event.LoggedInEvent;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves2.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves2.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.event.normal;
 
-import javax.webbeans.Observes;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.event.Observes;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Role;
 import org.apache.webbeans.test.component.IPayment;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AbstractComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AbstractComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AbstractComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AbstractComponent.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 abstract public class AbstractComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithFinalMethodComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithFinalMethodComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithFinalMethodComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithFinalMethodComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
 
 @Production
 public class AroundInvokeWithFinalMethodComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithSameMethodNameComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithSameMethodNameComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithSameMethodNameComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithSameMethodNameComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
 
 @Production
 public class AroundInvokeWithSameMethodNameComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithStaticMethodComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithStaticMethodComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithStaticMethodComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithStaticMethodComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
 
 @Production
 public class AroundInvokeWithStaticMethodComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithWrongReturnTypeComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithWrongReturnTypeComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithWrongReturnTypeComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithWrongReturnTypeComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
 
 @Production
 public class AroundInvokeWithWrongReturnTypeComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutExceptionComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutExceptionComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutExceptionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutExceptionComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
 
 @Production
 public class AroundInvokeWithoutExceptionComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutParameterComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutParameterComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutParameterComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutParameterComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
-import javax.webbeans.Production;
 
 @Production
 public class AroundInvokeWithoutParameterComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutReturnTypeComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutReturnTypeComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutReturnTypeComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutReturnTypeComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
 
 @Production
 public class AroundInvokeWithoutReturnTypeComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Production;
-import javax.webbeans.Standard;
+import javax.inject.Production;
+import javax.inject.Standard;
 
 @Production
 @Standard

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/FinalComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/FinalComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/FinalComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/FinalComponent.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 public final class FinalComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/HasFinalMethodComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/HasFinalMethodComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/HasFinalMethodComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/HasFinalMethodComponent.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/InnerComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/InnerComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/InnerComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/InnerComponent.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 public class InnerComponent
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneAroundInvokeComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneAroundInvokeComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneAroundInvokeComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneAroundInvokeComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
 
 @Production
 public class MoreThanOneAroundInvokeComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Production;
+import javax.inject.Initializer;
+import javax.inject.Production;
 
 @Production
 public class MoreThanOneConstructureComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent2.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent2.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Production;
+import javax.inject.Initializer;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.component.service.ServiceImpl1;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOnePostConstructComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOnePostConstructComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOnePostConstructComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOnePostConstructComponent.java Tue Jan 27 20:19:20 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 public class MoreThanOnePostConstructComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java Tue Jan 27 20:19:20 2009
@@ -13,11 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Current;
-import javax.webbeans.Disposes;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
+import javax.context.ApplicationScoped;
+import javax.inject.Current;
+import javax.inject.Disposes;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.component.service.IService;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.New;
-import javax.webbeans.Production;
+import javax.inject.New;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.New;
-import javax.webbeans.Production;
+import javax.inject.New;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.service.IService;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewMethodComponentBindingComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewMethodComponentBindingComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewMethodComponentBindingComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewMethodComponentBindingComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.New;
-import javax.webbeans.Production;
+import javax.inject.Initializer;
+import javax.inject.New;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.service.ITyped2;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NoConstructureComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NoConstructureComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NoConstructureComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NoConstructureComponent.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.service.ServiceImpl1;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasCheckedExceptionComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasCheckedExceptionComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasCheckedExceptionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasCheckedExceptionComponent.java Tue Jan 27 20:19:20 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 public class PostContructMethodHasCheckedExceptionComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasParameterComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasParameterComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasParameterComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasParameterComponent.java Tue Jan 27 20:19:20 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 public class PostContructMethodHasParameterComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasReturnTypeComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasReturnTypeComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasReturnTypeComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasReturnTypeComponent.java Tue Jan 27 20:19:20 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 public class PostContructMethodHasReturnTypeComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasStaticComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasStaticComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasStaticComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasStaticComponent.java Tue Jan 27 20:19:20 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 @Production
 public class PostContructMethodHasStaticComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.Standard;
+import javax.inject.Produces;
+import javax.inject.Production;
+import javax.inject.Standard;
 
 @Production
 public class ProducerTypeExceptionComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeStaticComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeStaticComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeStaticComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeStaticComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @Production
 public class ProducerTypeStaticComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer1.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer1.java Tue Jan 27 20:19:20 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.webbeans.test.component.exception.initializer;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Produces;
+import javax.inject.Initializer;
+import javax.inject.Produces;
 
 public class BrokenInitializer1
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer2.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer2.java Tue Jan 27 20:19:20 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.webbeans.test.component.exception.initializer;
 
-import javax.webbeans.Destructor;
-import javax.webbeans.Initializer;
+import javax.inject.Initializer;
+import javax.inject.Produces;
 
 public class BrokenInitializer2
 {
@@ -26,7 +26,7 @@
         
     }
     
-    @Initializer @Destructor
+    @Initializer @Produces
     public void init2()
     {
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer3.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer3.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer3.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer3.java Tue Jan 27 20:19:20 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.webbeans.test.component.exception.initializer;
 
-import javax.webbeans.Disposes;
-import javax.webbeans.Initializer;
+import javax.inject.Disposes;
+import javax.inject.Initializer;
 
 public class BrokenInitializer3
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer4.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer4.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer4.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/initializer/BrokenInitializer4.java Tue Jan 27 20:19:20 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.webbeans.test.component.exception.initializer;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Observes;
+import javax.event.Observes;
+import javax.inject.Initializer;
 
 public class BrokenInitializer4
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithRequestScope;
 import org.apache.webbeans.test.sterotype.StereoWithSessionScope;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithNonScope;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentNonDefaultScopeWithDifferentScopeSteros.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentNonDefaultScopeWithDifferentScopeSteros.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentNonDefaultScopeWithDifferentScopeSteros.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentNonDefaultScopeWithDifferentScopeSteros.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithRequestScope;
 import org.apache.webbeans.test.sterotype.StereoWithSessionScope;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDefaultScopeStero.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDefaultScopeStero.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDefaultScopeStero.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDefaultScopeStero.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithRequestScope;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDifferentScopeSteros.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDifferentScopeSteros.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDifferentScopeSteros.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDifferentScopeSteros.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithRequestScope;
 import org.apache.webbeans.test.sterotype.StereoWithSessionScope;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithNonScopeStero.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithNonScopeStero.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithNonScopeStero.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithNonScopeStero.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithNonScope;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithSessionScope;
 import org.apache.webbeans.test.sterotype.StereoWithSessionScope2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.webbeans.Production;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.sterotype.StereoWithNonScope;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java Tue Jan 27 20:19:20 2009
@@ -13,11 +13,11 @@
  */
 package org.apache.webbeans.test.component.intercept;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java Tue Jan 27 20:19:20 2009
@@ -19,11 +19,11 @@
 import java.util.Set;
 import java.util.Map.Entry;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java Tue Jan 27 20:19:20 2009
@@ -13,10 +13,10 @@
  */
 package org.apache.webbeans.test.component.intercept;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java Tue Jan 27 20:19:20 2009
@@ -13,11 +13,11 @@
  */
 package org.apache.webbeans.test.component.intercept;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java Tue Jan 27 20:19:20 2009
@@ -19,11 +19,11 @@
 import java.util.Set;
 import java.util.Map.Entry;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.intercept;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.Interceptors;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java Tue Jan 27 20:19:20 2009
@@ -13,12 +13,12 @@
  */
 package org.apache.webbeans.test.component.intercept;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.intercept;
 
+import javax.inject.Production;
 import javax.interceptor.Interceptors;
-import javax.webbeans.Production;
 
 @Production
 @Interceptors(value = { NoArgConstructorInterceptor.class })

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureComponent.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.intercept.webbeans;
 
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
 
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Secure;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureInterceptor.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureInterceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureInterceptor.java Tue Jan 27 20:19:20 2009
@@ -14,8 +14,8 @@
 package org.apache.webbeans.test.component.intercept.webbeans;
 
 import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Interceptor;
 
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Secure;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.intercept.webbeans;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.intercept.webbeans;
 
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Action;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeansInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeansInterceptor.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeansInterceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeansInterceptor.java Tue Jan 27 20:19:20 2009
@@ -14,8 +14,8 @@
 package org.apache.webbeans.test.component.intercept.webbeans;
 
 import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Interceptor;
 
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeanswithMetaInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeanswithMetaInterceptor.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeanswithMetaInterceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WebBeanswithMetaInterceptor.java Tue Jan 27 20:19:20 2009
@@ -14,8 +14,8 @@
 package org.apache.webbeans.test.component.intercept.webbeans;
 
 import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Interceptor;
 
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Action;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Action.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Action.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Action.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Action.java Tue Jan 27 20:19:20 2009
@@ -18,7 +18,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.webbeans.InterceptorBindingType;
+import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType
 @Retention(RetentionPolicy.RUNTIME)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java Tue Jan 27 20:19:20 2009
@@ -18,8 +18,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.webbeans.InterceptorBindingType;
-import javax.webbeans.NonBinding;
+import javax.annotation.NonBinding;
+import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType
 @Retention(RetentionPolicy.RUNTIME)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Transactional.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Transactional.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Transactional.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Transactional.java Tue Jan 27 20:19:20 2009
@@ -18,7 +18,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.webbeans.InterceptorBindingType;
+import javax.interceptor.InterceptorBindingType;
 
 @InterceptorBindingType
 @Retention(RetentionPolicy.RUNTIME)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java Tue Jan 27 20:19:20 2009
@@ -13,10 +13,10 @@
  */
 package org.apache.webbeans.test.component.library;
 
+import javax.context.RequestScoped;
+import javax.inject.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.newcomp;
 
-import javax.webbeans.New;
-import javax.webbeans.Production;
+import javax.inject.New;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.dependent.DependentOwnerComponent;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java Tue Jan 27 20:19:20 2009
@@ -13,12 +13,12 @@
  */
 package org.apache.webbeans.test.component.newcomp;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Named;
-import javax.webbeans.New;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.Dependent;
+import javax.context.RequestScoped;
+import javax.inject.New;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
 import org.apache.webbeans.test.component.IPayment;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java Tue Jan 27 20:19:20 2009
@@ -15,9 +15,9 @@
 
 import java.util.List;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java Tue Jan 27 20:19:20 2009
@@ -13,11 +13,11 @@
  */
 package org.apache.webbeans.test.component.producer;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.ApplicationScoped;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.ProducerBinding1;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.producer;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.producer;
 
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4.java Tue Jan 27 20:19:20 2009
@@ -16,7 +16,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 import org.apache.webbeans.test.annotation.binding.Users;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java Tue Jan 27 20:19:20 2009
@@ -15,7 +15,7 @@
 
 import java.util.List;
 
-import javax.webbeans.SessionScoped;
+import javax.context.SessionScoped;
 
 import org.apache.webbeans.test.annotation.binding.Users;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java Tue Jan 27 20:19:20 2009
@@ -13,10 +13,10 @@
  */
 package org.apache.webbeans.test.component.producer;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.SessionScoped;
+import javax.annotation.Named;
+import javax.context.SessionScoped;
+import javax.inject.Produces;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding2;
 import org.apache.webbeans.test.annotation.binding.Check;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.producer;
 
-import javax.webbeans.Named;
-import javax.webbeans.Production;
-import javax.webbeans.SessionScoped;
+import javax.annotation.Named;
+import javax.context.SessionScoped;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding2;
 import org.apache.webbeans.test.component.IPayment;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/StaticProducer1.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.producer;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
 
 @RequestScoped
 public class StaticProducer1

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent1.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent1.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.producer.broken;
 
-import javax.webbeans.Initializer;
-import javax.webbeans.Produces;
+import javax.inject.Initializer;
+import javax.inject.Produces;
 
 public class BrokenProducerComponent1
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent2.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent2.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.producer.broken;
 
-import javax.webbeans.Destructor;
-import javax.webbeans.Produces;
+import javax.inject.Initializer;
+import javax.inject.Produces;
 
 public class BrokenProducerComponent2
 {
@@ -24,7 +24,7 @@
     }
 
     @Produces
-    @Destructor
+    @Initializer
     public int broken2()
     {
         return 0;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent3.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent3.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent3.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent3.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.producer.broken;
 
-import javax.webbeans.Disposes;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
+import javax.event.Observes;
+import javax.inject.Disposes;
+import javax.inject.Produces;
 
 public class BrokenProducerComponent3
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent4.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent4.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent4.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent4.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.producer.broken;
 
-import javax.webbeans.Disposes;
+import javax.inject.Disposes;
+import javax.inject.Produces;
 
-import javax.webbeans.Produces;
 
 public class BrokenProducerComponent4
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent5.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent5.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent5.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent5.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.producer.broken;
 
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
+import javax.event.Observes;
+import javax.inject.Produces;
 
 public class BrokenProducerComponent5
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent6.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent6.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent6.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/broken/BrokenProducerComponent6.java Tue Jan 27 20:19:20 2009
@@ -15,7 +15,7 @@
 
 import java.util.List;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 public class BrokenProducerComponent6
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java Tue Jan 27 20:19:20 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.webbeans.test.component.producer.primitive;
 
-import javax.webbeans.Named;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveProducer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveProducer.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveProducer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveProducer.java Tue Jan 27 20:19:20 2009
@@ -16,8 +16,8 @@
  */
 package org.apache.webbeans.test.component.producer.primitive;
 
-import javax.webbeans.Dependent;
-import javax.webbeans.Produces;
+import javax.context.Dependent;
+import javax.inject.Produces;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java Tue Jan 27 20:19:20 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.producer.specializes;
 
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.Specializes;
+import javax.annotation.Named;
+import javax.inject.Produces;
+import javax.inject.Specializes;
 
 import org.apache.webbeans.test.annotation.deployment.DeploymentType2;
 import org.apache.webbeans.test.component.producer.specializes.superclazz.SpecializesProducer1SuperClazz;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/superclazz/SpecializesProducer1SuperClazz.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/superclazz/SpecializesProducer1SuperClazz.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/superclazz/SpecializesProducer1SuperClazz.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/superclazz/SpecializesProducer1SuperClazz.java Tue Jan 27 20:19:20 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.producer.specializes.superclazz;
 
-import javax.webbeans.Produces;
+import javax.inject.Produces;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java?rev=738223&r1=738222&r2=738223&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java Tue Jan 27 20:19:20 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.service;
 
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Production;
+import javax.context.ApplicationScoped;
+import javax.inject.Production;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 



Mime
View raw message