You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2009/11/22 18:06:00 UTC
svn commit: r883102 [1/2] - in /incubator/openwebbeans/trunk: webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/ webbeans-impl/src/main/java/org/apache/webbeans/annotation/ webbeans-impl/src/main/java/org/apache/webbeans/annotation/deployment/ we...

Author: struberg
Date: Sun Nov 22 17:05:57 2009
New Revision: 883102

URL: http://svn.apache.org/viewvc?rev=883102&view=rev
Log:
OWB-154 remove Bean#getDeploymentType() and DeploymentType in general - pt. II

This commit removes all Literals, etc and cleanup the codebase.


Removed:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/deployment/
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Mock.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/deployment/
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhDeployment2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/MockSpecializesService.java
Modified:
    incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/BindingComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPayment.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithCheckPaymentDecoratorField.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CheckWithMoneyPayment.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContainUserComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/ContaintsCurrentComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/CurrentBindingComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/DisposalMethodComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/InjectedTypeLiteralComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/NonBindingComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PaymentProcessorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructDoubleInterceptorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PostConstructInterceptorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/PreDestroyComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/Singleton.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/TypeLiteralComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/UserComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingAnnotationTypeComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/binding/BindingWithNonBindingArrayTypeComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/AccountComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/DependentOwnerComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObservable1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AbstractComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithFinalMethodComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithSameMethodNameComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithStaticMethodComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithWrongReturnTypeComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutExceptionComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutParameterComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutReturnTypeComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/FinalComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/HasFinalMethodComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/InnerComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneAroundInvokeComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOneConstructureComponent2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MoreThanOnePostConstructComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewMethodComponentBindingComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NoConstructureComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasCheckedExceptionComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasParameterComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasReturnTypeComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/PostContructMethodHasStaticComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeStaticComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentNonDefaultScopeWithDifferentScopeSteros.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDefaultScopeStero.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithDifferentScopeSteros.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithNonScopeStero.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithoutScopeStero.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/ParentComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithClassInterceptorsComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MethodInterceptedWithoutClassInterceptorsComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleInterceptedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/MultipleListOfInterceptedWithExcludeClassComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/NoArgConstructorInterceptorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/library/BookShop.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/ProducerNewComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer3.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ScopeAdaptorInjectorComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/SpecializesProducer1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/specializes/superclazz/SpecializesProducer1SuperClazz.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/InjectedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/ServiceImpl1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Typed2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/MultipleDependentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/initializer/BrokenInitializerTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/pfield/ProducerFieldComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/broken/BrokenProducerTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/primitive/PrimitiveProducerTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/specializes/SpecializesProducer1Test.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/SpecializationComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/definition1.xml
    incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/definition2.xml
    incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml
    incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java

Modified: incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java (original)
+++ incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java Sun Nov 22 17:05:57 2009
@@ -161,7 +161,6 @@
             ejbBean.setInjectionTarget(ejbBeanCreator.getInjectedTarget());   
         }
         
-        boolean addBeans = true;        
         BeanManagerImpl.getManager().addBean(ejbBean);
         BeanManagerImpl.getManager().getBeans().addAll(producerMethodBeans);
         BeanManagerImpl.getManager().getBeans().addAll(producerFieldBeans);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java Sun Nov 22 17:05:57 2009
@@ -33,7 +33,6 @@
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.creational.CreationalContextFactory;
 import org.apache.webbeans.context.creational.CreationalContextImpl;
-import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.inject.AlternativesManager;
 import org.apache.webbeans.intercept.InterceptorData;
 import org.apache.webbeans.logger.WebBeansLogger;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java Sun Nov 22 17:05:57 2009
@@ -68,20 +68,6 @@
     public abstract IBeanInheritedMetaData getInheritedMetaData();
     
     /**
-     * Returna deployment type as annotation.
-     * 
-     * @return deployment type as annotation
-     */
-    public abstract Annotation getType();
-
-    /**
-     * Sets bean deployment type annotation.
-     * 
-     * @param type bean deployment type annotation
-     */
-    public abstract void setType(Annotation type);
-
-    /**
      * Returns scope type annotation.
      * 
      * @return scope type annotation

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java Sun Nov 22 17:05:57 2009
@@ -21,7 +21,6 @@
 
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.annotation.StandardLiteral;
 
 
 public class InjectionPointBean extends AbstractBean<InjectionPoint>
@@ -35,7 +34,6 @@
         
         addQualifier(new DefaultLiteral());
         setImplScopeType(new DependentScopeLiteral());
-        setType(new StandardLiteral());
         addApiType(InjectionPoint.class);
         addApiType(Object.class);
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Sun Nov 22 17:05:57 2009
@@ -48,20 +48,15 @@
 import org.apache.webbeans.annotation.AnyLiteral;
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.annotation.ProductionLiteral;
-import org.apache.webbeans.annotation.deployment.DeploymentType;
-import org.apache.webbeans.annotation.deployment.Standard;
 import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.component.AbstractProducerBean;
 import org.apache.webbeans.component.BaseBean;
-import org.apache.webbeans.component.IBeanHasParent;
 import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
 import org.apache.webbeans.container.InjectionResolver;
-import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.event.EventUtil;
 import org.apache.webbeans.event.NotificationManager;
 import org.apache.webbeans.exception.WebBeansConfigurationException;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java Sun Nov 22 17:05:57 2009
@@ -21,7 +21,6 @@
 import org.apache.webbeans.context.creational.CreationalContextFactory;
 import org.apache.webbeans.conversation.ConversationManager;
 import org.apache.webbeans.decorator.DecoratorsManager;
-import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.deployment.StereoTypeManager;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.intercept.InterceptorsManager;
@@ -37,8 +36,6 @@
 
     public static final String SINGLETON_DECORATORS_MANAGER = DecoratorsManager.class.getName();
 
-    public static final String SINGLETON_DEPLOYMENT_TYPE_MANAGER = DeploymentTypeManager.class.getName();
-
     public static final String SINGLETON_STEREOTYPE_MANAGER = StereoTypeManager.class.getName();
 
     public static final String SINGLETON_INTERCEPTORS_MANAGER = InterceptorsManager.class.getName();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java Sun Nov 22 17:05:57 2009
@@ -45,9 +45,6 @@
     /**Inherited scope type*/
     protected Annotation inheritedScopeType = null;
     
-    /**Inherited deployment type*/
-    protected Annotation inheritedDeploymentType = null;
-
     /**
      * Create a new bean inherited data.
      * 
@@ -60,7 +57,6 @@
         this.inheritedClazz = inheritedClazz;
         
         setInheritedQualifiers();
-        setInheritedDeploymentType();
         setInheritedInterceptorBindings();
         setInheritedScopeType();
         setInheritedStereoTypes();
@@ -87,11 +83,6 @@
         return this.inheritedScopeType;
     }
     
-    public Annotation getInheritedDeploymentType()
-    {
-        return this.inheritedDeploymentType;
-    }
-    
     protected AbstractBean<T> getComponent()
     {
         return this.component;
@@ -122,11 +113,4 @@
      * @param inheritedScopeType the inheritedScopeType to set
      */
     abstract protected void setInheritedScopeType();
-
-    /**
-     * @param inheritedDeploymentType the inheritedDeploymentType to set
-     */
-    abstract protected void setInheritedDeploymentType();
-
-
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java Sun Nov 22 17:05:57 2009
@@ -26,7 +26,6 @@
 import javax.inject.Scope;
 import javax.interceptor.InterceptorBinding;
 
-import org.apache.webbeans.annotation.deployment.DeploymentType;
 import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.util.AnnotationUtil;
 
@@ -45,17 +44,6 @@
             setInheritedTypes(getInheritedQualifiers(), this.inheritedClazz, Qualifier.class);
         }        
     }
-
-     
-    protected void setInheritedDeploymentType()
-    {
-        if(this.inheritedClazz != Object.class)
-        {
-            setInheritedType(this.inheritedClazz, DeploymentType.class);
-        }
-        
-    }
-
     
     protected void setInheritedInterceptorBindings()
     {
@@ -101,10 +89,6 @@
                 {
                     this.inheritedScopeType = annotation;
                 }
-                else if(annotationType.equals(DeploymentType.class))
-                {
-                    this.inheritedDeploymentType = annotation;
-                }                
             }
         }
         else

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java Sun Nov 22 17:05:57 2009
@@ -29,6 +29,4 @@
     public Set<Annotation> getInheritedInterceptorBindings();
     
     public Annotation getInheritedScopeType();
-    
-    public Annotation getInheritedDeploymentType();
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Sun Nov 22 17:05:57 2009
@@ -29,9 +29,7 @@
 import org.apache.webbeans.annotation.AnyLiteral;
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.component.AbstractBean;
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.inject.NullableDependencyException;
 import org.apache.webbeans.util.AnnotationUtil;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Sun Nov 22 17:05:57 2009
@@ -22,7 +22,6 @@
 import javax.enterprise.context.NormalScope;
 import javax.inject.Scope;
 
-import org.apache.webbeans.annotation.deployment.DeploymentType;
 import org.apache.webbeans.deployment.stereotype.IStereoTypeModel;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.util.AnnotationUtil;
@@ -59,11 +58,6 @@
     {
         this.name = clazz.getName();
 
-        if (AnnotationUtil.hasMetaAnnotation(clazz.getDeclaredAnnotations(), DeploymentType.class))
-        {
-            this.defaultDeploymentType = AnnotationUtil.getMetaAnnotations(clazz.getDeclaredAnnotations(), DeploymentType.class)[0];
-        }
-
         if (AnnotationUtil.hasMetaAnnotation(clazz.getDeclaredAnnotations(), NormalScope.class))
         {
             this.defaultScopeType = AnnotationUtil.getMetaAnnotations(clazz.getDeclaredAnnotations(), NormalScope.class)[0];

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java Sun Nov 22 17:05:57 2009
@@ -24,7 +24,6 @@
 import javax.inject.Named;
 import javax.inject.Scope;
 
-import org.apache.webbeans.annotation.deployment.DeploymentType;
 import org.apache.webbeans.deployment.stereotype.IStereoTypeModel;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.definition.NonexistentTypeException;
@@ -93,15 +92,6 @@
                     defaultScopeType = defaultAnn;
                     scopeTypeFound = true;
                 }                
-                else if (clazz.isAnnotationPresent(DeploymentType.class))
-                {
-                    if (deploymentTypeFound)
-                    {
-                        throw new WebBeansConfigurationException(errorMessage + "@StereoType annotation can not contain more than one @DeploymentType annotation");
-                    }
-                    defaultDeploymentType = defaultAnn;
-                    deploymentTypeFound = true;
-                }
                 else if (AnnotationUtil.isInterceptorBindingAnnotation(annClazz))
                 {
                     Target target = clazz.getAnnotation(Target.class);

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -75,10 +75,7 @@
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.annotation.DependentScopeLiteral;
 import org.apache.webbeans.annotation.NewLiteral;
-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;
@@ -103,7 +100,6 @@
 import org.apache.webbeans.decorator.DecoratorUtil;
 import org.apache.webbeans.decorator.DecoratorsManager;
 import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
-import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.event.EventImpl;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansException;
@@ -595,7 +591,6 @@
         comp.setName(null);
         comp.addApiType(clazz);
         comp.addApiType(Object.class);
-        comp.setType(new ProductionLiteral());
 
         return comp;
     }
@@ -618,7 +613,6 @@
         
         comp.setImplScopeType(new ApplicationScopeLiteral());
         comp.addQualifier(new DefaultLiteral());
-        comp.setType(new ProductionLiteral());
         
         DefinitionUtil.defineObserverMethods(comp, clazz);
 
@@ -663,7 +657,6 @@
         
         comp.setImplScopeType(new DependentScopeLiteral());
         comp.addQualifier(new NewLiteral());
-        comp.setType(new StandardLiteral());
         comp.setName(null);
         
         Set<InjectionPoint> injectionPoints = component.getInjectionPoints();
@@ -690,7 +683,6 @@
         DefinitionUtil.defineApiTypes(component, returnType);
         DefinitionUtil.defineQualifiers(component, annotations);
 
-        component.setType(new StandardLiteral());
         component.setImplScopeType(new DependentScopeLiteral());                      
 
         return component;
@@ -705,7 +697,6 @@
         BeanManagerBean managerComponent = new BeanManagerBean();
 
         managerComponent.setImplScopeType(new DependentScopeLiteral());
-        managerComponent.setType(new StandardLiteral());
         managerComponent.addQualifier(new DefaultLiteral());
         managerComponent.addQualifier(new AnyLiteral());
         managerComponent.addApiType(BeanManager.class);
@@ -733,7 +724,6 @@
         
         instanceComponent.addQualifier(new AnyLiteral());
         instanceComponent.setImplScopeType(new DependentScopeLiteral());
-        instanceComponent.setType(new StandardLiteral());
         instanceComponent.setName(null);
                 
         return instanceComponent;
@@ -751,7 +741,6 @@
         conversationComp.addApiType(ConversationImpl.class);
         conversationComp.addApiType(Object.class);
         conversationComp.setImplScopeType(new RequestedScopeLiteral());
-        conversationComp.setType(new StandardLiteral());
         conversationComp.addQualifier(new DefaultLiteral());
         conversationComp.addQualifier(new AnyLiteral());
         conversationComp.setName("javax.enterprise.context.conversation");
@@ -1167,42 +1156,6 @@
         return false;
     }
 
-    public static Annotation getMaxPrecedenceSteroTypeDeploymentType(BaseBean<?> component)
-    {
-        Annotation[] deploymentTypes = getComponentStereoTypes(component);
-        Class<? extends Annotation> maxPrecedDeploymentType = null;
-        Annotation result = null;
-        if (deploymentTypes.length > 0)
-        {
-            for (Annotation dt : deploymentTypes)
-            {
-                if (AnnotationUtil.hasMetaAnnotation(dt.annotationType().getDeclaredAnnotations(), DeploymentType.class))
-                {
-                    Annotation result2[] = AnnotationUtil.getMetaAnnotations(dt.annotationType().getDeclaredAnnotations(), DeploymentType.class);
-
-                    Class<? extends Annotation> dtAnnot = result2[0].annotationType();
-                    if (maxPrecedDeploymentType == null)
-                    {
-                        maxPrecedDeploymentType = dtAnnot;
-                        result = result2[0];
-                    }
-                    else
-                    {
-                        if (DeploymentTypeManager.getInstance().comparePrecedences(maxPrecedDeploymentType, dtAnnot) < 0)
-                        {
-                            maxPrecedDeploymentType = dtAnnot;
-                            result = result2[0];
-                        }
-                    }
-                }
-
-            }
-        }
-
- 
-        return result;
-    }
-
     public static String getSimpleWebBeanDefaultName(String clazzName)
     {
         Asserts.assertNotNull(clazzName);
@@ -1260,24 +1213,12 @@
 
         Annotation[] annotations = clazz.getDeclaredAnnotations();
 
-        boolean deploymentTypeFound = false;
         boolean scopeTypeFound = false;
         for (Annotation annotation : annotations)
         {
             Class<? extends Annotation> annotType = annotation.annotationType();
 
-            if (annotType.isAnnotationPresent(DeploymentType.class))
-            {
-                if (deploymentTypeFound == true)
-                {
-                    throw new WebBeansConfigurationException("@StereoType annotation can not contain more than one @DeploymentType annotation");
-                }
-                else
-                {
-                    deploymentTypeFound = true;
-                }
-            }
-            else if (annotType.isAnnotationPresent(NormalScope.class) || annotType.isAnnotationPresent(Scope.class))
+            if (annotType.isAnnotationPresent(NormalScope.class) || annotType.isAnnotationPresent(Scope.class))
             {
                 if (scopeTypeFound == true)
                 {
@@ -1901,18 +1842,6 @@
         return component;
     }      
     
-    public static boolean isDeploymentTypeEnabled(Class<? extends Annotation> deploymentType)
-    {
-        Asserts.assertNotNull(deploymentType, "deplymentType parameter can not be null");
-        
-        if (!DeploymentTypeManager.getInstance().isDeploymentTypeEnabled(deploymentType))
-        {
-            return false;
-        }
-        
-        return true;        
-    }
-    
     /**
      * Returns <code>ProcessAnnotatedType</code> event. 
      * @param <T> bean type

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -45,9 +45,6 @@
 
 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;
@@ -56,7 +53,6 @@
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.decorator.DecoratorsManager;
-import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.definition.NonexistentConstructorException;
 import org.apache.webbeans.exception.definition.NonexistentFieldException;
@@ -92,9 +88,6 @@
 {
     private static final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansXMLConfigurator.class);
     
-    /** Enabled Deploy element check */
-    private boolean DEPLOY_IS_DEFINED = false;
-
     /** Enabled Interceptors element check */
     private boolean INTERCEPTORS_IS_DEFINED = false;
 
@@ -262,27 +255,6 @@
                 webBeanDeclerationList.add(child);
 
             }
-            /* <Deploy> element decleration */
-            else if (XMLUtil.isElementDeployDeclaration(child))
-            {
-                if (DEPLOY_IS_DEFINED)
-                {
-                    throw new DeploymentException("There can not be more than one web-beans.xml file that declares <Deploy> element");
-                }
-                else
-                {
-                    if (!XMLUtil.hasChildElement(child, WebBeansConstants.WEB_BEANS_XML_STANDART_ELEMENT))
-                    {
-                        throw new DeploymentException("<Deploy> element must have <Standard/> deployment type in the web-beans.xml");
-                    }
-                    
-                    DeploymentTypeManager.getInstance().removeProduction();
-                    
-                    configureDeploymentTypes(child);
-                    DEPLOY_IS_DEFINED = true;
-
-                }
-            }
             /* <Interceptors> element decleration */
             else if (XMLUtil.isElementInterceptorsDeclaration(child))
             {
@@ -339,15 +311,6 @@
             
         }
 
-        /*
-         * If no <Deploy> element is defined in any webbeans.xml in the current
-         * application
-         */
-        if (!DEPLOY_IS_DEFINED)
-        {
-            DeploymentTypeManager.getInstance().addNewDeploymentType(Production.class, 1);
-        }
-
         // Configures the WebBeans components
         configureWebBeansComponents(webBeanDeclerationList);
 
@@ -368,29 +331,8 @@
         {
             child = it.next();
 
-            /* <Deploy> element decleration */
-            if (XMLUtil.getName(child).equals(WebBeansConstants.WEB_BEANS_XML_SPEC_SPECIFIC_DEPLOY_ELEMENT))
-            {
-                if (DEPLOY_IS_DEFINED)
-                {
-                    throw new DeploymentException("There can not be more than one web-beans.xml file that declares <deploy> element");
-                }
-                else
-                {
-                    if (!XMLUtil.hasChildElement(child, WebBeansConstants.WEB_BEANS_XML_STANDART_ELEMENT))
-                    {
-                        throw new DeploymentException("<Deploy> element must have <Standard/> deployment type in the web-beans.xml");
-                    }
-                    
-                    DeploymentTypeManager.getInstance().removeProduction();
-                    
-                    configureDeploymentTypes(child);
-                    DEPLOY_IS_DEFINED = true;
-
-                }
-            }
             /* <Interceptors> element decleration */
-            else if (XMLUtil.getName(child).equals(WebBeansConstants.WEB_BEANS_XML_SPEC_SPECIFIC_INTERCEPTORS_ELEMENT))
+            if (XMLUtil.getName(child).equals(WebBeansConstants.WEB_BEANS_XML_SPEC_SPECIFIC_INTERCEPTORS_ELEMENT))
             {
                 if (INTERCEPTORS_IS_DEFINED)
                 {
@@ -423,15 +365,6 @@
             }
         }
 
-        /*
-         * If no <Deploy> element is defined in any webbeans.xml in the current
-         * application
-         */
-        if (!DEPLOY_IS_DEFINED)
-        {
-            DeploymentTypeManager.getInstance().addNewDeploymentType(Production.class, 1);
-        }
-
     }
     
     /**
@@ -727,56 +660,6 @@
         }        
     }
     
-
-    /**
-     * Configures enablements of the deployment types.
-     * 
-     * @param deployElement deploy element
-     */
-    private void configureDeploymentTypes(Element deployElement)
-    {
-        List<Element> childs = deployElement.elements();
-        Iterator<Element> itChilds = childs.iterator();
-
-        int j = 1;
-        while (itChilds.hasNext())
-        {
-            Element child = itChilds.next();
-            Class<?> clazz = null;
-            
-            if(this.owbSpecificConfiguration)
-            {
-                clazz = XMLUtil.getElementJavaType(child);
-            }
-            else
-            {
-                clazz = ClassUtil.getClassFromName(child.getTextTrim());
-            }
-
-            if (clazz == null)
-            {
-                throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "@DeploymentType annotation with name : " + XMLUtil.getName(child) + " not found");
-            }
-            else
-            {
-                if (!clazz.isAnnotation())
-                    throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "@DeploymentType annotation with name : " + XMLUtil.getName(child) + " is not annotation type");
-                else
-                {
-                    Annotation ann = clazz.getAnnotation(DeploymentType.class);
-                    if (ann == null)
-                    {
-                        throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "@DeploymentType annotation with name : " + XMLUtil.getName(child) + " is not deployment type annotation");
-                    }
-                    else
-                    {
-                        DeploymentTypeManager.getInstance().addNewDeploymentType((Class<? extends Annotation>) clazz, j++);
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * Configures new webbeans component from the given webbeans element.
      * 
@@ -1021,9 +904,6 @@
         // StereoType
         configureStereoType(component, annotationSet, annotationElementList);
 
-        // Deployment Type
-        configureDeploymentType(component, annotationSet, annotationElementList);
-
         // Scope Type
         configureScopeType(component, annotationSet, annotationElementList);
 
@@ -1069,9 +949,6 @@
         // StereoType
         configureStereoType(component, annotationSet, annotationElementList);
 
-        // Deployment Type
-        configureDeploymentType(component, annotationSet, annotationElementList);
-
         // Scope Type
         configureScopeType(component, annotationSet, annotationElementList);
 
@@ -1592,38 +1469,6 @@
     }
 
     /**
-     * Configures the deployment type of the XML component.
-     * 
-     * @param component xml defined web beans component
-     * @param annotationSet all annotation defined in XML
-     */
-    private <T> void configureDeploymentType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
-    {
-        Class<? extends Annotation> deploymentType = XMLDefinitionUtil.defineXMLTypeMetaData(component, annotationSet, DeploymentType.class, createConfigurationFailedMessage() + "@DeploymentType annotation is not configured correctly for class : " + component.getReturnType().getName());
-
-        if (deploymentType == null)
-        {
-            // Check from stereotype
-            Annotation stereoTypeDeploymentType = WebBeansUtil.getMaxPrecedenceSteroTypeDeploymentType(component);
-            
-            if(stereoTypeDeploymentType == null)
-            {
-                // Default deployment type
-                component.setType(new ProductionLiteral());                
-            }
-            else
-            {
-                component.setType(stereoTypeDeploymentType);
-            }
-            
-        }
-        else
-        {
-            component.setType(JavassistProxyFactory.createNewAnnotationProxy(deploymentType));
-        }
-    }
-
-    /**
      * Configures the webbeans scope type.
      * 
      * @param component xml defined web beans component

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -37,7 +37,6 @@
 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;
@@ -124,15 +123,14 @@
             while (it.hasNext())
             {
                 Class<? extends Annotation> clazz = it.next();
-                if (clazz.isAnnotationPresent(DeploymentType.class) 
-                        || clazz.isAnnotationPresent(NormalScope.class) 
-                        || clazz.isAnnotationPresent(Scope.class)
-                        || AnnotationUtil.isQualifierAnnotation(clazz)
-                        || AnnotationUtil.isInterceptorBindingAnnotation(clazz) 
-                        || AnnotationUtil.isStereoTypeAnnotation(clazz) 
-                        || clazz.equals(Named.class) 
-                        || clazz.equals(Specializes.class) || clazz.equals(javax.interceptor.Interceptor.class) 
-                        || clazz.equals(Decorator.class))
+                if (clazz.isAnnotationPresent(NormalScope.class) 
+                    || clazz.isAnnotationPresent(Scope.class)
+                    || AnnotationUtil.isQualifierAnnotation(clazz)
+                    || AnnotationUtil.isInterceptorBindingAnnotation(clazz) 
+                    || AnnotationUtil.isStereoTypeAnnotation(clazz) 
+                    || clazz.equals(Named.class) 
+                    || clazz.equals(Specializes.class) || clazz.equals(javax.interceptor.Interceptor.class) 
+                    || clazz.equals(Decorator.class))
                 {
                     continue;
                 }
@@ -612,7 +610,7 @@
 
         for (Class<? extends Annotation> memberLevelMetaDataClass : memberLevelMetaData)
         {
-            if (!memberLevelMetaDataClass.isAnnotationPresent(DeploymentType.class) && !memberLevelMetaDataClass.isAnnotationPresent(NormalScope.class) && !AnnotationUtil.isStereoTypeAnnotation(memberLevelMetaDataClass) && !memberLevelMetaDataClass.equals(Named.class))
+            if (!memberLevelMetaDataClass.isAnnotationPresent(NormalScope.class) && !AnnotationUtil.isStereoTypeAnnotation(memberLevelMetaDataClass) && !memberLevelMetaDataClass.equals(Named.class))
             {
                 throw new WebBeansConfigurationException(errorMessage + "Defined annotations for producer method name : " + producesMethod.getName() + " in class : " + component.getReturnType().getName() + " is not correct");
             }

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -64,9 +64,6 @@
 #Lifecycle to start container
 org.apache.webbeans.spi.lifecycle.Lifecycle=org.apache.webbeans.lifecycle.EnterpriseLifeCycle
 
-#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
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=883102&r1=883101&r2=883102&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Sun Nov 22 17:05:57 2009
@@ -35,7 +35,6 @@
 import junit.framework.Assert;
 
 import org.apache.log4j.Logger;
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.component.WebBeansType;
@@ -47,7 +46,6 @@
 import org.apache.webbeans.decorator.DecoratorUtil;
 import org.apache.webbeans.decorator.DecoratorsManager;
 import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
-import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.deployment.StereoTypeManager;
 import org.apache.webbeans.deployment.StereoTypeModel;
 import org.apache.webbeans.intercept.InterceptorUtil;
@@ -140,22 +138,12 @@
         manager.clear();
         PluginLoader.getInstance().startUp();            
         
-        initDefaultDeploymentTypes();
         initInterceptors();
         initDecorators();
         initStereoTypes();
         initDependentContext();            
     }
 
-    /**
-     * Initialize deployment types.
-     */
-    protected void initDefaultDeploymentTypes()
-    {
-        initializeDeploymentType(Production.class, 1);
-
-    }
-    
     protected void initDependentContext()
     {
         DependentContext dependentContext = (DependentContext)ContextFactory.getStandardContext(Dependent.class);
@@ -565,18 +553,6 @@
     }
 
     /**
-     * Add new deployment type with given precedence.
-     * 
-     * @param deploymentType deployment type
-     * @param precedence precedence
-     */
-    protected void initializeDeploymentType(Class<? extends Annotation> deploymentType, int precedence)
-    {
-        DeploymentTypeManager.getInstance().addNewDeploymentType(deploymentType, precedence);
-
-    }
-
-    /**
      * Add new stereotype model.
      * 
      * @param stereoClass stereotype class

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,10 +17,8 @@
 
 import javax.enterprise.context.SessionScoped;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.AnnotationWithBindingMember;
 
-@Production
 @AnnotationWithBindingMember(value = "B", number = 3)
 @SessionScoped
 public class BindingComponent implements Serializable

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -16,10 +16,8 @@
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
-@Production
 @RequestScoped
 @Check(type = "CHECK")
 @Named

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -15,10 +15,8 @@
 
 import javax.enterprise.context.RequestScoped;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
-@Production
 @RequestScoped
 @Check(type = "CHECK")
 public class CheckWithCheckPaymentDecoratorField implements IPayment

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -15,10 +15,8 @@
 
 import javax.enterprise.context.RequestScoped;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
-@Production
 @RequestScoped
 @Check(type = "MONEY")
 public class CheckWithMoneyPayment implements IPayment

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,9 +17,7 @@
 import javax.enterprise.inject.Default;
 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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,10 +17,8 @@
 import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
-import org.apache.webbeans.annotation.deployment.Production;
 
 @RequestScoped
-@Production
 public class ContaintsCurrentComponent
 {
     @Inject @Default CurrentBindingComponent comp;

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,12 +17,10 @@
 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;
 
-@Production
 @RequestScoped
 @Named("current")
 @SuppressWarnings("unchecked")

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -21,11 +21,9 @@
 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.component.service.IService;
 
-@Production
 @RequestScoped
 @Named
 public class DisposalMethodComponent

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -16,9 +16,7 @@
 import javax.enterprise.inject.Default;
 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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -18,11 +18,9 @@
 import javax.enterprise.context.SessionScoped;
 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;
 
-@Production
 @AnnotationWithNonBindingMember(value = "B", arg1 = "arg1", arg2 = "arg2")
 @SessionScoped
 public class NonBindingComponent implements Serializable

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,11 +17,9 @@
 import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
 @RequestScoped
-@Production
 @Default
 public class PaymentProcessorComponent
 {

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,10 +17,8 @@
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
-@Production
 @RequestScoped
 public class PostConstructComponent
 {

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -18,12 +18,10 @@
 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;
 
-@Production
 @RequestScoped
 @Interceptors(value = { Interceptor1.class, Interceptor2.class })
 public class PostConstructDoubleInterceptorComponent

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -18,11 +18,9 @@
 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;
 
-@Production
 @RequestScoped
 @Interceptors(value = { PostConstructInterceptor.class })
 public class PostConstructInterceptorComponent

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -18,10 +18,8 @@
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.Check;
 
-@Production
 @RequestScoped
 public class PreDestroyComponent
 {

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -19,7 +19,6 @@
 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;
@@ -27,7 +26,6 @@
 @SessionScoped
 @SingletonBinding
 @Named("singletonInstance")
-@Production
 public class Singleton implements Serializable
 {
     private ITyped2<String, Object> typed2 = null;

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -18,9 +18,7 @@
 import javax.enterprise.context.RequestScoped;
 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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -18,9 +18,7 @@
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;
 
-import org.apache.webbeans.annotation.deployment.Production;
 
-@Production
 @SessionScoped
 @Named("userComponent")
 public class UserComponent implements Serializable

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -16,10 +16,8 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.NonBindingAnnotationType;
 
-@Production
 @RequestScoped
 @NonBindingAnnotationType(currenr = @Default)
 public class BindingWithNonBindingAnnotationTypeComponent

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -15,10 +15,8 @@
 
 import javax.enterprise.context.RequestScoped;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.annotation.binding.NonBindingArrayType;
 
-@Production
 @RequestScoped
 @NonBindingArrayType
 public class BindingWithNonBindingArrayTypeComponent

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -18,9 +18,7 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Default;
 
-import org.apache.webbeans.annotation.deployment.Production;
 
-@Production
 @RequestScoped
 @Default
 public class AccountComponent implements Account

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -15,9 +15,6 @@
 
 import javax.enterprise.context.Dependent;
 
-import org.apache.webbeans.annotation.deployment.Production;
-
-@Production
 @Dependent
 public class DependentComponent
 {

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,9 +17,6 @@
 import javax.enterprise.inject.Default;
 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/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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -15,10 +15,8 @@
 
 import javax.enterprise.event.Observes;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.event.broke.BrokenEvent;
 
-@Production
 public class BrokenObserverComponent1
 {
 

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -16,9 +16,7 @@
 import javax.enterprise.event.Observes;
 
 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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,10 +17,8 @@
 import javax.enterprise.inject.Produces;
 
 import org.apache.log4j.spi.LoggingEvent;
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.CurrentBindingComponent;
 
-@Production
 public class BrokenObserverComponent3
 {
 

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,10 +17,8 @@
 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
 public class BrokenObserverComponent4
 {
 

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,10 +17,8 @@
 import javax.enterprise.inject.Produces;
 
 import org.apache.log4j.spi.LoggingEvent;
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.CurrentBindingComponent;
 
-@Production
 public class BrokenObserverComponent5
 {
 

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -17,10 +17,8 @@
 import javax.enterprise.inject.Disposes;
 
 import org.apache.log4j.spi.LoggingEvent;
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.component.CurrentBindingComponent;
 
-@Production
 public class BrokenObserverComponent6
 {
 

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=883102&r1=883101&r2=883102&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 Nov 22 17:05:57 2009
@@ -19,11 +19,9 @@
 import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
-import org.apache.webbeans.annotation.deployment.Production;
 import org.apache.webbeans.test.event.LoggedInEvent;
 
 @RequestScoped
-@Production
 @Default
 public class ComponentWithObservable1
 {