You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/11/07 10:53:00 UTC
svn commit: r833663 [1/2] - in
/incubator/openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/annotation/
main/java/org/apache/webbeans/component/
main/java/org/apache/webbeans/config/
main/java/org/apache/webbeans/container/ main/java/...
Author: gerdogdu
Date: Sat Nov 7 09:52:57 2009
New Revision: 833663
URL: http://svn.apache.org/viewvc?rev=833663&view=rev
Log:
Update regarding to api change.Adding test and changing some method names.
Added:
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java (with props)
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypeLiteralTest.java (with props)
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
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/NamedLiteral.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.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/RequestedScopeLiteral.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.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/component/AbstractInjectionTargetBean.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.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/container/BeanManagerImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.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/XMLDefinitionUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/AnnotationWithNonBindingMember.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Binding1Literal.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/DummyAnnotationLiteral.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeIsnotInterface.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeMustImplementAllDecoratedTypes.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/MoreThanOneDelegateAttribute.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent3.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/annotation/LiteralType.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/binding/BrokenBindingComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/definition/BeanTypesTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.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/disposal/DisposalTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/BrokenComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.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/inject/InjectedInstanceComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/broken/InjectedInstanceBrokenComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/named/NamedTests.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.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/intercept/webbeans/WebBeansInterceptComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.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/portable/events/ExtensionTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/StaticProducerTest.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/specializes/logger/LoggerSpecializationTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,8 +13,8 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
public class AnyLiteral extends AnnotationLiteral<Any> implements Any{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java Sat Nov 7 09:52:57 2009
@@ -15,7 +15,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
/**
* {@link RequestScoped} literal annotation.
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,8 +13,8 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Default;
+import javax.enterprise.util.AnnotationLiteral;
/**
* {@link Default} literal annotation.
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java Sat Nov 7 09:52:57 2009
@@ -14,7 +14,7 @@
package org.apache.webbeans.annotation;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
/**
* {@link Dependent} literal annotation.
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.apache.webbeans.annotation.deployment.Production;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.apache.webbeans.annotation.deployment.Standard;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Named;
/**
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,8 +13,8 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.New;
+import javax.enterprise.util.AnnotationLiteral;
/**
* {@link New} literal annotation.
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.apache.webbeans.annotation.deployment.Production;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java Sat Nov 7 09:52:57 2009
@@ -14,7 +14,7 @@
package org.apache.webbeans.annotation;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
/**
* {@link RequestScoped} literal annotation.
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java Sat Nov 7 09:52:57 2009
@@ -15,7 +15,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
/**
* {@link RequestScoped} literal annotation.
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.apache.webbeans.annotation.deployment.Standard;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Sat Nov 7 09:52:57 2009
@@ -18,7 +18,7 @@
import java.util.HashSet;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
@@ -302,7 +302,7 @@
Set<Field> fields = getInjectedFields();
for (Field field : fields)
{
- if (field.getAnnotation(Decorates.class) == null)
+ if (field.getAnnotation(Delegate.class) == null)
{
injectField(field, instance);
}
@@ -314,7 +314,7 @@
Set<Field> fields = getInjectedFromSuperFields();
for (Field field : fields)
{
- if (field.getAnnotation(Decorates.class) == null)
+ if (field.getAnnotation(Delegate.class) == null)
{
injectField(field, instance);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java Sat Nov 7 09:52:57 2009
@@ -21,8 +21,8 @@
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.TypeLiteral;
import org.apache.webbeans.inject.instance.InstanceFactory;
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=833663&r1=833662&r2=833663&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 Sat Nov 7 09:52:57 2009
@@ -25,13 +25,12 @@
import java.util.List;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.NormalScope;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.BeanTypes;
import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.NonBinding;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.UnsatisfiedResolutionException;
@@ -40,6 +39,7 @@
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.NonBinding;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Scope;
@@ -869,7 +869,7 @@
Annotation[] anns = field.getDeclaredAnnotations();
// Injected fields can not be @Decorates or @Produces
- if (AnnotationUtil.hasAnnotation(anns, Produces.class) || AnnotationUtil.hasAnnotation(anns, Decorates.class))
+ if (AnnotationUtil.hasAnnotation(anns, Produces.class) || AnnotationUtil.hasAnnotation(anns, Delegate.class))
{
continue;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Sat Nov 7 09:52:57 2009
@@ -40,7 +40,6 @@
import javax.enterprise.inject.AmbiguousResolutionException;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.Stereotype;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
@@ -51,6 +50,7 @@
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.ObserverMethod;
+import javax.enterprise.util.TypeLiteral;
import javax.inject.Scope;
import javax.naming.NamingException;
import javax.naming.Reference;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java Sat Nov 7 09:52:57 2009
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.inject.spi.Decorator;
import org.apache.webbeans.component.ManagedBean;
@@ -97,7 +97,7 @@
boolean found = false;
for (Field field : fields)
{
- if (AnnotationUtil.hasAnnotation(field.getDeclaredAnnotations(), Decorates.class))
+ if (AnnotationUtil.hasAnnotation(field.getDeclaredAnnotations(), Delegate.class))
{
if (found)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Sat Nov 7 09:52:57 2009
@@ -21,7 +21,7 @@
import java.util.HashSet;
import java.util.Set;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.InjectionPoint;
@@ -96,7 +96,7 @@
protected void initDelegate()
{
- Field field = ClassUtil.getFieldWithAnnotation(this.clazz, Decorates.class);
+ Field field = ClassUtil.getFieldWithAnnotation(this.clazz, Delegate.class);
if(field == null)
{
@@ -113,7 +113,7 @@
Class<?> superClazz = delegateClazz.getSuperclass();
if(!superClazz.equals(Object.class))
{
- Field field = ClassUtil.getFieldWithAnnotation(superClazz, Decorates.class);
+ Field field = ClassUtil.getFieldWithAnnotation(superClazz, Delegate.class);
if(field != null)
{
initDelegateInternal(field);
@@ -208,7 +208,7 @@
public void setDelegate(Object instance, Object delegate)
{
- Field field = ClassUtil.getFieldWithAnnotation(getClazz(), Decorates.class);
+ Field field = ClassUtil.getFieldWithAnnotation(getClazz(), Delegate.class);
if (!field.isAccessible())
{
field.setAccessible(true);
@@ -252,7 +252,7 @@
Set<Field> injectedFields = delegate.getInjectedFromSuperFields();
for (Field injectedField : injectedFields)
{
- boolean isDecorates = injectedField.isAnnotationPresent(Decorates.class);
+ boolean isDecorates = injectedField.isAnnotationPresent(Delegate.class);
if (!isDecorates)
{
@@ -269,7 +269,7 @@
injectedFields = delegate.getInjectedFields();
for (Field injectedField : injectedFields)
{
- boolean isDecorates = injectedField.isAnnotationPresent(Decorates.class);
+ boolean isDecorates = injectedField.isAnnotationPresent(Delegate.class);
if (!isDecorates)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Sat Nov 7 09:52:57 2009
@@ -19,7 +19,7 @@
import java.util.List;
import javax.enterprise.event.Event;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.util.AnnotationUtil;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Sat Nov 7 09:52:57 2009
@@ -33,8 +33,8 @@
import javax.enterprise.event.Reception;
import javax.enterprise.event.TransactionPhase;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.ObserverMethod;
+import javax.enterprise.util.TypeLiteral;
import javax.transaction.Status;
import javax.transaction.Synchronization;
import javax.transaction.Transaction;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java Sat Nov 7 09:52:57 2009
@@ -20,8 +20,8 @@
import java.util.Set;
import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.container.InjectionResolver;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java Sat Nov 7 09:52:57 2009
@@ -25,10 +25,10 @@
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.NonBinding;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
+import javax.enterprise.util.NonBinding;
import javax.interceptor.InvocationContext;
import org.apache.webbeans.component.AbstractBean;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Sat Nov 7 09:52:57 2009
@@ -26,9 +26,9 @@
import java.util.StringTokenizer;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.NonBinding;
import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.NonBinding;
import javax.inject.Qualifier;
import javax.interceptor.InterceptorBinding;
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=833663&r1=833662&r2=833663&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 Sat Nov 7 09:52:57 2009
@@ -53,7 +53,6 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.Stereotype;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.UnproxyableResolutionException;
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
@@ -62,6 +61,7 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.Interceptor;
+import javax.enterprise.util.TypeLiteral;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
@@ -1729,24 +1729,10 @@
throw new WebBeansConfigurationException("<Instance> field injection " + injectionPoint.toString() + " must have type javax.inject.Instance");
}
else
- {
- if(typeArgs.length == 1)
+ {
+ if(typeArgs.length != 1)
{
- Type actualArgument = typeArgs[0];
-
- if(ClassUtil.isParametrizedType(actualArgument) || ClassUtil.isWildCardType(actualArgument) || ClassUtil.isTypeVariable(actualArgument))
- {
- throw new WebBeansConfigurationException("<Instance> field injection " + injectionPoint.toString() + " actual type argument can not be Parametrized, Wildcard type or Type variable");
- }
-
- if(ClassUtil.isDefinitionConstainsTypeVariables((Class<?>)actualArgument))
- {
- throw new WebBeansConfigurationException("<Instance> field injection " + injectionPoint.toString() + " must not have TypeVariable or WildCard generic type argument");
- }
- }
- else
- {
- throw new WebBeansConfigurationException("<Instance> field injection " + injectionPoint.toString() + " must not have more than one actual type argument");
+ throw new WebBeansConfigurationException("<Instance> field injection " + injectionPoint.toString() + " must not have more than one actual type argument");
}
}
}
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=833663&r1=833662&r2=833663&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 Sat Nov 7 09:52:57 2009
@@ -26,12 +26,12 @@
import javax.annotation.PreDestroy;
import javax.decorator.Decorator;
import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.NonBinding;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.Interceptor;
+import javax.enterprise.util.NonBinding;
import javax.inject.Named;
import javax.inject.Scope;
import javax.interceptor.AroundInvoke;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/AnnotationWithNonBindingMember.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/AnnotationWithNonBindingMember.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/AnnotationWithNonBindingMember.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/AnnotationWithNonBindingMember.java Sat Nov 7 09:52:57 2009
@@ -18,7 +18,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.NonBinding;
+import javax.enterprise.util.NonBinding;
import javax.inject.Qualifier;
@Qualifier
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Binding1Literal.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Binding1Literal.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Binding1Literal.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/Binding1Literal.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.annotation.binding;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
public class Binding1Literal extends AnnotationLiteral<Binding1> implements Binding1
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/DummyAnnotationLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/DummyAnnotationLiteral.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/DummyAnnotationLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/DummyAnnotationLiteral.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.annotation.binding;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
public class DummyAnnotationLiteral extends AnnotationLiteral<ParameterBinding1> implements ParameterBinding1
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeIsnotInterface.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeIsnotInterface.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeIsnotInterface.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeIsnotInterface.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.component.decorator.broken;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import org.apache.webbeans.test.component.BindingComponent;
@@ -21,7 +21,7 @@
@Decorator
public class DelegateAttributeIsnotInterface
{
- @Decorates
+ @Delegate
BindingComponent decorates;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeMustImplementAllDecoratedTypes.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeMustImplementAllDecoratedTypes.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeMustImplementAllDecoratedTypes.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/DelegateAttributeMustImplementAllDecoratedTypes.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.component.decorator.broken;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import org.apache.webbeans.test.component.IPayment;
@@ -22,7 +22,7 @@
@Decorator
public class DelegateAttributeMustImplementAllDecoratedTypes implements IPayment, IService
{
- @Decorates
+ @Delegate
IPayment delegate;
public String pay()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/MoreThanOneDelegateAttribute.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/MoreThanOneDelegateAttribute.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/MoreThanOneDelegateAttribute.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/MoreThanOneDelegateAttribute.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.component.decorator.broken;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import org.apache.webbeans.test.component.IPayment;
@@ -21,9 +21,9 @@
@Decorator
public class MoreThanOneDelegateAttribute implements IPayment
{
- @Decorates
+ @Delegate
IPayment payment;
- @Decorates
+ @Delegate
IPayment payment2;
public String pay()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/broken/PaymentDecorator.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.component.decorator.broken;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Any;
@@ -25,7 +25,7 @@
@RequestScoped
public class PaymentDecorator implements IPayment
{
- @Decorates @Any @Check(type = "CHECK")
+ @Delegate @Any @Check(type = "CHECK")
IPayment delegate;
public String pay()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/LargeTransactionDecorator.java Sat Nov 7 09:52:57 2009
@@ -15,7 +15,7 @@
import java.math.BigDecimal;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.enterprise.context.RequestScoped;
@@ -23,7 +23,7 @@
@RequestScoped
public abstract class LargeTransactionDecorator implements Account
{
- @Decorates Account account;
+ @Delegate Account account;
BigDecimal depositeAmount = null;
BigDecimal withDrawAmount = null;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.component.decorator.clean;
-import javax.decorator.Decorates;
+import javax.decorator.Delegate;
import javax.decorator.Decorator;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
@@ -26,7 +26,7 @@
@RequestScoped
public abstract class ServiceDecorator implements IService
{
- @Decorates @Binding1 IService delegate;
+ @Delegate @Binding1 IService delegate;
private String delegateAttr = null;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent3.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent3.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent3.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent3.java Sat Nov 7 09:52:57 2009
@@ -23,5 +23,5 @@
public class InstanceInjectedBrokenComponent3
{
- @Inject @Any Instance<?> instance;
+ @Inject @Any Instance instance;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java Sat Nov 7 09:52:57 2009
@@ -18,7 +18,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.NonBinding;
+import javax.enterprise.util.NonBinding;
import javax.interceptor.InterceptorBinding;
@InterceptorBinding
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java Sat Nov 7 09:52:57 2009
@@ -18,7 +18,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.NonBinding;
+import javax.enterprise.util.NonBinding;
import javax.interceptor.InterceptorBinding;
@InterceptorBinding
Added: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java?rev=833663&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java (added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java Sat Nov 7 09:52:57 2009
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.webbeans.test.component.literals;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.util.TypeLiteral;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+@Named("literalBean")
+public class InstanceTypeLiteralBean
+{
+ public static interface IOrder<T>{};
+
+ public static class StringOrder implements IOrder<String>{};
+
+ public static class IntegerOrder extends StringOrder{};
+
+ private @Inject Instance<IOrder<String>> instance;
+
+ public Instance<?> produce(int type)
+ {
+ if(type == 0)
+ {
+ return instance.select(new TypeLiteral<IntegerOrder>(){}, new Annotation[0]);
+ }
+ else
+ {
+ return instance.select(new TypeLiteral<StringOrder>(){}, new Annotation[0]);
+ }
+ }
+}
Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java Sat Nov 7 09:52:57 2009
@@ -24,7 +24,6 @@
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
@@ -34,6 +33,7 @@
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.ObserverMethod;
+import javax.enterprise.util.TypeLiteral;
import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.component.BeanManagerBean;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java Sat Nov 7 09:52:57 2009
@@ -313,7 +313,7 @@
* @param clazz simple webbeans class
* @return simple webbean
*/
- protected <T> AbstractBean<T> defineSimpleWebBean(Class<T> clazz)
+ protected <T> AbstractBean<T> defineManagedBean(Class<T> clazz)
{
ManagedBean<T> bean = null;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java Sat Nov 7 09:52:57 2009
@@ -48,9 +48,9 @@
{
clear();
- defineSimpleWebBean(Typed2.class);
- defineSimpleWebBean(CurrentBindingComponent.class);
- defineSimpleWebBean(ContaintsCurrentComponent.class);
+ defineManagedBean(Typed2.class);
+ defineManagedBean(CurrentBindingComponent.class);
+ defineManagedBean(ContaintsCurrentComponent.class);
List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java Sat Nov 7 09:52:57 2009
@@ -50,8 +50,8 @@
{
clear();
- defineSimpleWebBean(ServiceImpl1.class);
- defineSimpleWebBean(DisposalMethodComponent.class);
+ defineManagedBean(ServiceImpl1.class);
+ defineManagedBean(DisposalMethodComponent.class);
List<AbstractBean<?>> comps = getComponents();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java Sat Nov 7 09:52:57 2009
@@ -44,8 +44,8 @@
{
clear();
- defineSimpleWebBean(InjectedComponent.class);
- defineSimpleWebBean(ServiceImpl1.class);
+ defineManagedBean(InjectedComponent.class);
+ defineManagedBean(ServiceImpl1.class);
List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java Sat Nov 7 09:52:57 2009
@@ -49,8 +49,8 @@
public void testTypedComponent() throws Throwable
{
clear();
- defineSimpleWebBean(BindingComponent.class);
- defineSimpleWebBean(NonBindingComponent.class);
+ defineManagedBean(BindingComponent.class);
+ defineManagedBean(NonBindingComponent.class);
List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java Sat Nov 7 09:52:57 2009
@@ -49,9 +49,9 @@
{
clear();
- defineSimpleWebBean(CheckWithCheckPayment.class);
- defineSimpleWebBean(CheckWithMoneyPayment.class);
- defineSimpleWebBean(PaymentProcessorComponent.class);
+ defineManagedBean(CheckWithCheckPayment.class);
+ defineManagedBean(CheckWithMoneyPayment.class);
+ defineManagedBean(PaymentProcessorComponent.class);
List<AbstractBean<?>> comps = getComponents();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java Sat Nov 7 09:52:57 2009
@@ -50,8 +50,8 @@
{
clear();
- defineSimpleWebBean(CheckWithCheckPayment.class);
- defineSimpleWebBean(PostConstructComponent.class);
+ defineManagedBean(CheckWithCheckPayment.class);
+ defineManagedBean(PostConstructComponent.class);
List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java Sat Nov 7 09:52:57 2009
@@ -52,8 +52,8 @@
{
clear();
- defineSimpleWebBean(CheckWithCheckPayment.class);
- defineSimpleWebBean(PreDestroyComponent.class);
+ defineManagedBean(CheckWithCheckPayment.class);
+ defineManagedBean(PreDestroyComponent.class);
List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java Sat Nov 7 09:52:57 2009
@@ -51,9 +51,9 @@
{
clear();
- defineSimpleWebBean(ServiceImpl1.class);
- defineSimpleWebBean(Producer1.class);
- defineSimpleWebBean(Producer1ConsumerComponent.class);
+ defineManagedBean(ServiceImpl1.class);
+ defineManagedBean(Producer1.class);
+ defineManagedBean(Producer1ConsumerComponent.class);
List<AbstractBean<?>> comps = getComponents();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java Sat Nov 7 09:52:57 2009
@@ -16,7 +16,7 @@
import java.lang.annotation.Annotation;
import java.util.List;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
import javax.servlet.ServletContext;
import junit.framework.Assert;
@@ -63,7 +63,7 @@
public void testProducerDeployment1()
{
clear();
- defineSimpleWebBean(Producer1.class);
+ defineManagedBean(Producer1.class);
Assert.assertEquals(3, getDeployedComponents());
}
@@ -72,7 +72,7 @@
public void testProducerDeployment2()
{
clear();
- defineSimpleWebBean(Producer2.class);
+ defineManagedBean(Producer2.class);
Assert.assertEquals(4, getDeployedComponents());
}
@@ -80,7 +80,7 @@
public void testProducerDeployment3()
{
clear();
- defineSimpleWebBean(Producer3.class);
+ defineManagedBean(Producer3.class);
Assert.assertEquals(6, getDeployedComponents());
}
@@ -89,7 +89,7 @@
public void testParametrizedProducer()
{
clear();
- defineSimpleWebBean(ParametrizedProducer.class);
+ defineManagedBean(ParametrizedProducer.class);
ContextFactory.initRequestContext(null);
Assert.assertEquals(4, getDeployedComponents());
@@ -116,8 +116,8 @@
@Test
public void testProducer4()
{
- defineSimpleWebBean(Producer4.class);
- AbstractBean<Producer4ConsumerComponent> component = defineSimpleWebBean(Producer4ConsumerComponent.class);
+ defineManagedBean(Producer4.class);
+ AbstractBean<Producer4ConsumerComponent> component = defineManagedBean(Producer4ConsumerComponent.class);
ContextFactory.initSessionContext(new MockHttpSession());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java Sat Nov 7 09:52:57 2009
@@ -47,9 +47,9 @@
{
clear();
- defineSimpleWebBean(CheckWithCheckPayment.class);
- defineSimpleWebBean(ScopeAdaptorComponent.class);
- defineSimpleWebBean(ScopeAdaptorInjectorComponent.class);
+ defineManagedBean(CheckWithCheckPayment.class);
+ defineManagedBean(ScopeAdaptorComponent.class);
+ defineManagedBean(ScopeAdaptorInjectorComponent.class);
HttpSession session = getSession();
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java Sat Nov 7 09:52:57 2009
@@ -52,8 +52,8 @@
{
clear();
- defineSimpleWebBean(Typed2.class);
- defineSimpleWebBean(Singleton.class);
+ defineManagedBean(Typed2.class);
+ defineManagedBean(Singleton.class);
List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java Sat Nov 7 09:52:57 2009
@@ -50,7 +50,7 @@
public void testTypedComponent() throws Throwable
{
clear();
- defineSimpleWebBean(TypedComponent.class);
+ defineManagedBean(TypedComponent.class);
List<AbstractBean<?>> list = getComponents();
@SuppressWarnings("unused")
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java Sat Nov 7 09:52:57 2009
@@ -52,8 +52,8 @@
{
clear();
- defineSimpleWebBean(Typed2.class);
- defineSimpleWebBean(TypedInjection.class);
+ defineManagedBean(Typed2.class);
+ defineManagedBean(TypedInjection.class);
List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
@@ -84,8 +84,8 @@
{
clear();
- defineSimpleWebBean(Typed2.class);
- defineSimpleWebBean(TypedInjectionWithoutArguments.class);
+ defineManagedBean(Typed2.class);
+ defineManagedBean(TypedInjectionWithoutArguments.class);
List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java Sat Nov 7 09:52:57 2009
@@ -50,8 +50,8 @@
{
clear();
- defineSimpleWebBean(UserComponent.class);
- defineSimpleWebBean(ContainUserComponent.class);
+ defineManagedBean(UserComponent.class);
+ defineManagedBean(ContainUserComponent.class);
List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/annotation/LiteralType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/annotation/LiteralType.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/annotation/LiteralType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/annotation/LiteralType.java Sat Nov 7 09:52:57 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.unittests.annotation;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.apache.webbeans.test.annotation.binding.AnnotationWithBindingMember;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java Sat Nov 7 09:52:57 2009
@@ -42,18 +42,18 @@
@Test
public void testAny()
{
- AbstractBean<AnyBindingComponent> comp1 = defineSimpleWebBean(AnyBindingComponent.class);
+ AbstractBean<AnyBindingComponent> comp1 = defineManagedBean(AnyBindingComponent.class);
Set<Annotation> qualifiers = comp1.getQualifiers();
Assert.assertEquals(2, qualifiers.size());
- AbstractBean<NonAnyBindingComponent> comp2 = defineSimpleWebBean(NonAnyBindingComponent.class);
+ AbstractBean<NonAnyBindingComponent> comp2 = defineManagedBean(NonAnyBindingComponent.class);
qualifiers = comp2.getQualifiers();
Assert.assertEquals(4, qualifiers.size());
- AbstractBean<DefaultAnyBinding> comp3 = defineSimpleWebBean(DefaultAnyBinding.class);
+ AbstractBean<DefaultAnyBinding> comp3 = defineManagedBean(DefaultAnyBinding.class);
qualifiers = comp3.getQualifiers();
Assert.assertEquals(2, qualifiers.size());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/BrokenBindingComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/BrokenBindingComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/BrokenBindingComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/BrokenBindingComponentTest.java Sat Nov 7 09:52:57 2009
@@ -40,7 +40,7 @@
{
try
{
- defineSimpleWebBean(BindingWithNonBindingArrayTypeComponent.class);
+ defineManagedBean(BindingWithNonBindingArrayTypeComponent.class);
}
catch (Exception e)
{
@@ -55,7 +55,7 @@
{
try
{
- defineSimpleWebBean(BindingWithNonBindingAnnotationTypeComponent.class);
+ defineManagedBean(BindingWithNonBindingAnnotationTypeComponent.class);
}
catch (Exception e)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java Sat Nov 7 09:52:57 2009
@@ -99,7 +99,7 @@
try
{
defineSimpleWebBeansDecorators(PaymentDecorator.class);
- defineSimpleWebBean(CheckWithCheckPaymentDecoratorField.class);
+ defineManagedBean(CheckWithCheckPaymentDecoratorField.class);
}
catch (Exception e)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java Sat Nov 7 09:52:57 2009
@@ -67,9 +67,9 @@
@Test
public void test1()
{
- defineSimpleWebBean(CheckWithCheckPayment.class);
+ defineManagedBean(CheckWithCheckPayment.class);
defineSimpleWebBeansDecorators(ServiceDecorator.class);
- AbstractBean<ServiceImpl1> component = defineSimpleWebBean(ServiceImpl1.class);
+ AbstractBean<ServiceImpl1> component = defineManagedBean(ServiceImpl1.class);
ContextFactory.initRequestContext(null);
ContextFactory.initApplicationContext(null);
@@ -93,7 +93,7 @@
public void test2()
{
defineSimpleWebBeansDecorators(LargeTransactionDecorator.class);
- AbstractBean<AccountComponent> component = defineSimpleWebBean(AccountComponent.class);
+ AbstractBean<AccountComponent> component = defineManagedBean(AccountComponent.class);
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/definition/BeanTypesTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/definition/BeanTypesTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/definition/BeanTypesTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/definition/BeanTypesTest.java Sat Nov 7 09:52:57 2009
@@ -44,7 +44,7 @@
{
clear();
- Bean<BeanTypesDefinedBean> bean = defineSimpleWebBean(BeanTypesDefinedBean.class);
+ Bean<BeanTypesDefinedBean> bean = defineManagedBean(BeanTypesDefinedBean.class);
Set<Type> apiTypes = bean.getTypes();
Assert.assertEquals(1, apiTypes.size());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java Sat Nov 7 09:52:57 2009
@@ -44,8 +44,8 @@
public void testDependent()
{
clear();
- defineSimpleWebBean(DependentComponent.class);
- defineSimpleWebBean(DependentOwnerComponent.class);
+ defineManagedBean(DependentComponent.class);
+ defineManagedBean(DependentOwnerComponent.class);
ContextFactory.initRequestContext(null);
@@ -69,8 +69,8 @@
ContextFactory.initRequestContext(null);
- AbstractBean<DependentA> componentA = defineSimpleWebBean(DependentA.class);
- AbstractBean<DependentB> componentB = defineSimpleWebBean(DependentB.class);
+ AbstractBean<DependentA> componentA = defineManagedBean(DependentA.class);
+ AbstractBean<DependentB> componentB = defineManagedBean(DependentB.class);
Assert.assertNotNull(componentB);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/MultipleDependentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/MultipleDependentTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/MultipleDependentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/MultipleDependentTest.java Sat Nov 7 09:52:57 2009
@@ -46,8 +46,8 @@
clear();
ContextFactory.initRequestContext(null);
- defineSimpleWebBean(DependentComponent.class);
- defineSimpleWebBean(MultipleDependentComponent.class);
+ defineManagedBean(DependentComponent.class);
+ defineManagedBean(MultipleDependentComponent.class);
MultipleDependentComponent bean = (MultipleDependentComponent)getManager().getInstance(getComponents().get(1));
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java?rev=833663&r1=833662&r2=833663&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java Sat Nov 7 09:52:57 2009
@@ -45,7 +45,7 @@
ContextFactory.initRequestContext(null);
ContextFactory.initSessionContext(new MockHttpSession());
- defineSimpleWebBean(Disposal1.class);
+ defineManagedBean(Disposal1.class);
@SuppressWarnings("unchecked")
List<Integer> list = (List<Integer>) getManager().getInstanceByName("createBinding1");