svn commit: r824079 [2/3] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/annotation/deployment/ main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/compon...

[ge...@apache.org]

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sun Oct 11 14:03:41 2009
@@ -41,29 +41,29 @@
 import javax.enterprise.context.Conversation;
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.Dependent;
-import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.NormalScope;
+import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Alternative;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.IllegalProductException;
 import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Specializes;
-import javax.inject.Named;
-import javax.inject.Scope;
 import javax.enterprise.inject.New;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Specializes;
 import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.deployment.DeploymentType;
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.stereotype.Stereotype;
 import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Scope;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
@@ -74,24 +74,26 @@
 import org.apache.webbeans.annotation.ProductionLiteral;
 import org.apache.webbeans.annotation.RequestedScopeLiteral;
 import org.apache.webbeans.annotation.StandardLiteral;
+import org.apache.webbeans.annotation.deployment.DeploymentType;
 import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.component.BaseBean;
-import org.apache.webbeans.component.EnterpriseBeanMarker;
-import org.apache.webbeans.component.ManagedBean;
+import org.apache.webbeans.component.BeanManagerBean;
 import org.apache.webbeans.component.ConversationBean;
+import org.apache.webbeans.component.EnterpriseBeanMarker;
+import org.apache.webbeans.component.EventBean;
 import org.apache.webbeans.component.ExtensionBean;
 import org.apache.webbeans.component.InjectionPointBean;
 import org.apache.webbeans.component.InstanceBean;
-import org.apache.webbeans.component.BeanManagerBean;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.component.NewBean;
-import org.apache.webbeans.component.EventBean;
-import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.component.ProducerFieldBean;
+import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.component.WebBeansType;
 import org.apache.webbeans.config.DefinitionUtil;
 import org.apache.webbeans.config.EJBWebBeansConfigurator;
 import org.apache.webbeans.config.ManagedBeanConfigurator;
+import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.conversation.ConversationImpl;
 import org.apache.webbeans.decorator.DecoratorUtil;
@@ -105,6 +107,7 @@
 import org.apache.webbeans.exception.inject.DefinitionException;
 import org.apache.webbeans.exception.inject.InconsistentSpecializationException;
 import org.apache.webbeans.exception.inject.NullableDependencyException;
+import org.apache.webbeans.inject.AlternativesManager;
 import org.apache.webbeans.intercept.InterceptorData;
 import org.apache.webbeans.intercept.InterceptorDataImpl;
 import org.apache.webbeans.intercept.InterceptorType;
@@ -1352,12 +1355,22 @@
                         
             if (superBean != null)
             {
-                int res = DeploymentTypeManager.getInstance().comparePrecedences(specialized.getDeploymentType(), superBean.getDeploymentType());
-                if (res <= 0)
+                //check for alternative
+                boolean useAlternative = OpenWebBeansConfiguration.getInstance().useAlternativeOrDeploymentType();
+                
+                if(!useAlternative)
                 {
-                    throw new InconsistentSpecializationException("@Specializes exception. Class : " + specializedClass.getName() + " must have higher deployment type precedence from the class : " + superClass.getName());
+                    int res = DeploymentTypeManager.getInstance().comparePrecedences(specialized.getDeploymentType(), superBean.getDeploymentType());
+                    if (res <= 0)
+                    {
+                        throw new InconsistentSpecializationException("@Specializes exception. Class : " + specializedClass.getName() + " must have higher deployment type precedence from the class : " + superClass.getName());
+                    }    
                 }
-                
+                else
+                {
+                    ((AbstractBean<?>)superBean).setEnabled(false);
+                }
+                                
                 AbstractBean<?> comp = (AbstractBean<?>)specialized;
 
                 if(superBean.getName() != null)
@@ -1390,7 +1403,9 @@
         
         Set<Bean<?>> components = BeanManagerImpl.getManager().getComponents();
         Iterator<Bean<?>> it = components.iterator();
-
+        
+        boolean useAlternative = OpenWebBeansConfiguration.getInstance().useAlternativeOrDeploymentType();
+        
         while (it.hasNext())
         {
             AbstractBean<?> bean = (AbstractBean<?>)it.next();
@@ -1403,18 +1418,33 @@
                     {
                         if(!(bean instanceof NewBean))
                         {
-                            if(DeploymentTypeManager.getInstance().isDeploymentTypeEnabled(bean.getDeploymentType()))
+                            if(!useAlternative)
                             {
-                                beans.add(bean);    
-                            }                            
+                                if(DeploymentTypeManager.getInstance().isDeploymentTypeEnabled(bean.getDeploymentType()))
+                                {
+                                    beans.add(bean);    
+                                }                                                            
+                            }
+                            
+                            else
+                            {
+                                beans.add(bean);
+                            }
                         }                           
                     }                                    
                 }
                 else
                 {
-                    if(DeploymentTypeManager.getInstance().isDeploymentTypeEnabled(bean.getDeploymentType()))
+                    if(!useAlternative)
                     {
-                        beans.add(bean);   
+                        if(DeploymentTypeManager.getInstance().isDeploymentTypeEnabled(bean.getDeploymentType()))
+                        {
+                            beans.add(bean);   
+                        }                        
+                    }
+                    else
+                    {
+                        beans.add(bean);
                     }
                 }
             }
@@ -2058,4 +2088,16 @@
         
     }
     
+    public static void setBeanEnableFlag(AbstractBean<?> bean)
+    {
+        Asserts.assertNotNull(bean, "bean can not be null");
+        
+        if(AnnotationUtil.hasClassAnnotation(bean.getBeanClass(), Alternative.class))
+        {
+            if(!AlternativesManager.getInstance().isBeanHasAlternative(bean))
+            {
+                bean.setEnabled(false);
+            }
+        }
+    }
 }
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansNameSpaceContainer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansNameSpaceContainer.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansNameSpaceContainer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansNameSpaceContainer.java Sun Oct 11 14:03:41 2009
@@ -80,7 +80,7 @@
                 eePackages.add("javax.enterprise.context.spi.");
                 eePackages.add("javax.enterprise.event.");
                 eePackages.add("javax.enterprise.inject.");
-                eePackages.add("javax.enterprise.inject.deployment.");
+                eePackages.add("org.apache.webbeans.annotation.deployment.");
                 eePackages.add("javax.enterprise.inject.spi.");
                 eePackages.add("javax.inject.");
                 eePackages.add("javax.context.");

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Sun Oct 11 14:03:41 2009
@@ -39,8 +39,6 @@
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.DeploymentType;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 import javax.inject.Scope;
 import javax.interceptor.Interceptor;
@@ -48,6 +46,8 @@
 import org.apache.webbeans.WebBeansConstants;
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.annotation.ProductionLiteral;
+import org.apache.webbeans.annotation.deployment.DeploymentType;
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.component.xml.XMLManagedBean;
 import org.apache.webbeans.component.xml.XMLProducerBean;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java Sun Oct 11 14:03:41 2009
@@ -26,18 +26,18 @@
 import javax.annotation.PreDestroy;
 import javax.decorator.Decorator;
 import javax.enterprise.context.NormalScope;
-import javax.inject.Named;
-import javax.inject.Scope;
 import javax.enterprise.inject.NonBinding;
 import javax.enterprise.inject.Specializes;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.deployment.DeploymentType;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.Interceptor;
+import javax.inject.Named;
+import javax.inject.Scope;
 import javax.interceptor.AroundInvoke;
 
 import org.apache.webbeans.WebBeansConstants;
+import org.apache.webbeans.annotation.deployment.DeploymentType;
 import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.component.xml.XMLManagedBean;
 import org.apache.webbeans.component.xml.XMLProducerBean;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java Sun Oct 11 14:03:41 2009
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.webbeans.WebBeansConstants;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties Sun Oct 11 14:03:41 2009
@@ -58,8 +58,11 @@
 #use OWB Specific XML Configuration
 org.apache.webbeans.useOwbSpecificXmlConfig=false
 
-#use OWB Specific injection. If true, uses spec. defined injection with @Inject
+#use OWB Specific injection. If false, uses spec. defined injection with @Inject
 org.apache.webbeans.fieldInjection.useOwbSpecificInjection=false
 
+#use @Alternative or @DeploymentType
+org.apache.webbeans.resolver.useAlternative=true
+
 #conversation service
 org.apache.webbeans.spi.conversation.ConversationService=org.apache.webbeans.spi.conversation.jsf.JSFConversationServiceImpl
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Mock.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Mock.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Mock.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Mock.java Sun Oct 11 14:03:41 2009
@@ -18,7 +18,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.deployment.DeploymentType;
+import org.apache.webbeans.annotation.deployment.DeploymentType;
 
 @DeploymentType
 @Retention(RetentionPolicy.RUNTIME)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType1.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType1.java Sun Oct 11 14:03:41 2009
@@ -19,7 +19,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.deployment.DeploymentType;
+import org.apache.webbeans.annotation.deployment.DeploymentType;
 
 @DeploymentType
 @Retention(RUNTIME)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType2.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/DeploymentType2.java Sun Oct 11 14:03:41 2009
@@ -19,7 +19,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.deployment.DeploymentType;
+import org.apache.webbeans.annotation.deployment.DeploymentType;
 
 @DeploymentType
 @Retention(RUNTIME)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/BindingComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/BindingComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/BindingComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/BindingComponent.java Sun Oct 11 14:03:41 2009
@@ -16,8 +16,8 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.AnnotationWithBindingMember;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPayment.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPayment.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPayment.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPayment.java Sun Oct 11 14:03:41 2009
@@ -15,8 +15,8 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPaymentDecoratorField.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPaymentDecoratorField.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPaymentDecoratorField.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPaymentDecoratorField.java Sun Oct 11 14:03:41 2009
@@ -14,8 +14,8 @@
 package org.apache.webbeans.test.component;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithMoneyPayment.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithMoneyPayment.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithMoneyPayment.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithMoneyPayment.java Sun Oct 11 14:03:41 2009
@@ -14,8 +14,8 @@
 package org.apache.webbeans.test.component;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContainUserComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContainUserComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContainUserComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContainUserComponent.java Sun Oct 11 14:03:41 2009
@@ -15,9 +15,10 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
+
 @Production
 @RequestScoped
 public class ContainUserComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContaintsCurrentComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContaintsCurrentComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContaintsCurrentComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContaintsCurrentComponent.java Sun Oct 11 14:03:41 2009
@@ -15,9 +15,10 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
+
 @RequestScoped
 @Production
 public class ContaintsCurrentComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CurrentBindingComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CurrentBindingComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CurrentBindingComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CurrentBindingComponent.java Sun Oct 11 14:03:41 2009
@@ -14,10 +14,10 @@
 package org.apache.webbeans.test.component;
 
 import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
+import javax.inject.Named;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;
 import org.apache.webbeans.test.component.service.ITyped2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/DisposalMethodComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/DisposalMethodComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/DisposalMethodComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/DisposalMethodComponent.java Sun Oct 11 14:03:41 2009
@@ -17,11 +17,11 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.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/InjectedTypeLiteralComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/InjectedTypeLiteralComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/InjectedTypeLiteralComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/InjectedTypeLiteralComponent.java Sun Oct 11 14:03:41 2009
@@ -14,9 +14,10 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
+
 @Production
 @RequestScoped
 public class InjectedTypeLiteralComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/NonBindingComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/NonBindingComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/NonBindingComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/NonBindingComponent.java Sun Oct 11 14:03:41 2009
@@ -16,9 +16,9 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.AnnotationWithBindingMember;
 import org.apache.webbeans.test.annotation.binding.AnnotationWithNonBindingMember;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PaymentProcessorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PaymentProcessorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PaymentProcessorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PaymentProcessorComponent.java Sun Oct 11 14:03:41 2009
@@ -15,9 +15,9 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructComponent.java Sun Oct 11 14:03:41 2009
@@ -15,9 +15,9 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructDoubleInterceptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructDoubleInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructDoubleInterceptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructDoubleInterceptorComponent.java Sun Oct 11 14:03:41 2009
@@ -15,10 +15,10 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 import javax.interceptor.Interceptors;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 import org.apache.webbeans.test.component.intercept.Interceptor1;
 import org.apache.webbeans.test.component.intercept.Interceptor2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructInterceptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructInterceptorComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructInterceptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructInterceptorComponent.java Sun Oct 11 14:03:41 2009
@@ -15,10 +15,10 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 import javax.interceptor.Interceptors;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 import org.apache.webbeans.test.component.intercept.PostConstructInterceptor;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java Sun Oct 11 14:03:41 2009
@@ -16,9 +16,9 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/Singleton.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/Singleton.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/Singleton.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/Singleton.java Sun Oct 11 14:03:41 2009
@@ -16,10 +16,10 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
+import javax.inject.Named;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.SingletonBinding;
 import org.apache.webbeans.test.component.service.ITyped2;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/TypeLiteralComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/TypeLiteralComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/TypeLiteralComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/TypeLiteralComponent.java Sun Oct 11 14:03:41 2009
@@ -16,9 +16,10 @@
 import java.util.List;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
+
 @Production
 @RequestScoped
 public class TypeLiteralComponent implements ITypeLiteralComponent<List<String>>

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/UserComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/UserComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/UserComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/UserComponent.java Sun Oct 11 14:03:41 2009
@@ -17,7 +17,8 @@
 
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.Production;
 
 @Production
 @SessionScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingAnnotationTypeComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingAnnotationTypeComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingAnnotationTypeComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingAnnotationTypeComponent.java Sun Oct 11 14:03:41 2009
@@ -15,8 +15,8 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.NonBindingAnnotationType;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingArrayTypeComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingArrayTypeComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingArrayTypeComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingArrayTypeComponent.java Sun Oct 11 14:03:41 2009
@@ -14,8 +14,8 @@
 package org.apache.webbeans.test.component.binding;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.NonBindingArrayType;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/AccountComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/AccountComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/AccountComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/AccountComponent.java Sun Oct 11 14:03:41 2009
@@ -17,7 +17,8 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.Production;
 
 @Production
 @RequestScoped

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentComponent.java Sun Oct 11 14:03:41 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.test.component.dependent;
 
 import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.Production;
 
 @Production
 @Dependent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentOwnerComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentOwnerComponent.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentOwnerComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentOwnerComponent.java Sun Oct 11 14:03:41 2009
@@ -15,9 +15,10 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
+
 @Production
 @RequestScoped
 public class DependentOwnerComponent

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java Sun Oct 11 14:03:41 2009
@@ -13,15 +13,15 @@
  */
 package org.apache.webbeans.test.component.disposal;
 
-import java.util.List;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.Disposes;
-import javax.inject.Named;
 import javax.enterprise.inject.Produces;
+import javax.inject.Named;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent1.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent1.java Sun Oct 11 14:03:41 2009
@@ -14,8 +14,8 @@
 package org.apache.webbeans.test.component.event.broken;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.event.broke.BrokenEvent;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java Sun Oct 11 14:03:41 2009
@@ -14,9 +14,9 @@
 package org.apache.webbeans.test.component.event.broken;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.deployment.Production;
 
 import org.apache.log4j.spi.LoggingEvent;
+import org.apache.webbeans.annotation.deployment.Production;
 
 @Production
 public class BrokenObserverComponent2

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java Sun Oct 11 14:03:41 2009
@@ -15,9 +15,9 @@
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
 
 import org.apache.log4j.spi.LoggingEvent;
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.CurrentBindingComponent;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java Sun Oct 11 14:03:41 2009
@@ -14,10 +14,10 @@
 package org.apache.webbeans.test.component.event.broken;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
 import org.apache.log4j.spi.LoggingEvent;
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.CurrentBindingComponent;
 
 @Production

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java?rev=824079&r1=824078&r2=824079&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java Sun Oct 11 14:03:41 2009
@@ -15,9 +15,9 @@
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
 
 import org.apache.log4j.spi.LoggingEvent;
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.CurrentBindingComponent;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -15,9 +15,9 @@
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.deployment.Production;
 
 import org.apache.log4j.spi.LoggingEvent;
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.CurrentBindingComponent;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -17,9 +17,9 @@
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.event.LoggedInEvent;
 
 @RequestScoped

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -17,8 +17,8 @@
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -15,8 +15,8 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Role;
 import org.apache.webbeans.test.component.IPayment;
 import org.apache.webbeans.test.component.PaymentProcessorComponent;

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,10 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,10 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,10 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,10 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,10 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,9 +13,10 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,10 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,8 +13,8 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
-import javax.enterprise.inject.deployment.Standard;
+import org.apache.webbeans.annotation.deployment.Production;
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
-
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,10 +13,11 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,9 +13,10 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,9 +13,9 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -17,8 +17,8 @@
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,9 +14,9 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.enterprise.inject.New;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Binding1;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,9 +14,9 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.enterprise.inject.New;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.service.IService;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,9 +14,9 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.enterprise.inject.New;
-import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.service.ITyped2;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception;
 
-import javax.enterprise.inject.deployment.Production;
-
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.service.ServiceImpl1;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,8 +14,9 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
-import javax.enterprise.inject.deployment.Standard;
+
+import org.apache.webbeans.annotation.deployment.Production;
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
+
+import org.apache.webbeans.annotation.deployment.Production;
 
 @Production
 public class ProducerTypeStaticComponent

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -16,8 +16,8 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -16,8 +16,8 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.deployment.Production;
 
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.sterotype.StereoWithNonScope;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.enterprise.inject.deployment.Production;
-
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.enterprise.inject.deployment.Production;
-
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.sterotype.StereoWithRequestScope;
 
 @Production

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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.enterprise.inject.deployment.Production;
-
+import org.apache.webbeans.annotation.deployment.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=824079&r1=824078&r2=824079&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 Sun Oct 11 14:03:41 2009
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.test.component.exception.stero;
 
-import javax.enterprise.inject.deployment.Production;
-
+import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.sterotype.StereoWithNonScope;
 
 @Production