openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r809349 [1/2] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/annotation/ main/java/org/apache/webbeans/config/ main/java/org/apache/webbeans/container/ main/resources/META-INF/openwebbeans/ test/java/org...
Date Sun, 30 Aug 2009 14:53:42 GMT
Author: gerdogdu
Date: Sun Aug 30 14:53:37 2009
New Revision: 809349

URL: http://svn.apache.org/viewvc?rev=809349&view=rev
Log:
Update for JSR-330

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.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/NewLiteral.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/config/DefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.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/annotation/binding/NonBindingAnnotationType.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/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/TypeLiteralComponent.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/decorator/clean/AccountComponent.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/dependent/DependentOwnerComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/MultipleDependentComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentA.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentB.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.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/ComponentWithObserves1.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/inject/InstanceInjectedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent2.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/inject/broken/InstanceInjectedBrokenComponent4.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/generic/GenericComponentInjector.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/Interceptor2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureAndTransactionalComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/ShoppingCard.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/newcomp/NewComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldDefinitionComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldInjectedComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/events/MyExtension.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/Producer4ConsumerComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.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/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/component/specializes/AsynhrounousSpecalizesService.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/SpecializesServiceInjectorComponent.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/TypedComponentTest.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/intercept/PostConstructDoubleInterceptorComponentTest.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/ShoppingCardInterceptorTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/PortableTests.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.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/testBeanUnnamed.xml

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java Sun Aug 30 14:53:37 2009
@@ -14,15 +14,15 @@
 package org.apache.webbeans.annotation;
 
 import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 
 /**
- * {@link Current} literal annotation.
+ * {@link Default} literal annotation.
  * 
  * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
  * @since 1.0
  */
-public class CurrentLiteral extends AnnotationLiteral<Current> implements Current
+public class CurrentLiteral extends AnnotationLiteral<Default> implements Default
 {
 
 }

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -16,7 +16,7 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 
 /**
  * {@link Dependent} literal annotation.

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.annotation;
 
 import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.New;
 
 /**

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -15,7 +15,7 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 
 /**
  * {@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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -16,7 +16,7 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 
 /**
  * {@link RequestScoped} literal annotation.

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -27,6 +27,7 @@
 import java.util.Set;
 
 import javax.decorator.Decorates;
+import javax.enterprise.context.Dependent;
 import javax.enterprise.context.NormalScope;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Disposes;
@@ -785,22 +786,27 @@
     {
 
         Field[] fields = clazz.getDeclaredFields();
+        boolean useOwbSpecificInjection = OpenWebBeansConfiguration.getInstance().isOwbSpecificFieldInjection();
+            
         if (fields.length != 0)
         {
             for (Field field : fields)
             {
+                if(!useOwbSpecificInjection)
+                {
+                    if(!field.isAnnotationPresent(Inject.class))
+                    {
+                        continue;
+                    }                       
+                }
                 
-            	//TODO Check TEsts
-            	/*
-            	 *
                 if(ClassUtil.isPublic(field.getModifiers()))
                 {
                     if(!component.getScopeType().equals(Dependent.class))
                     {
                         throw new WebBeansConfigurationException("If bean has a public modifier injection point, bean scope type must be defined as @Dependent");
                     }
-                }            	 
-            	 */
+                }                
                 
                 Annotation[] anns = field.getDeclaredAnnotations();
 
@@ -850,11 +856,9 @@
                             }
                         }
                     }
-                }
-
+                }                                    
             }
         }
-
     }
 
     public static <T> void defineInjectedMethods(AbstractInjectionTargetBean<T> component)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java Sun Aug 30 14:53:37 2009
@@ -48,6 +48,9 @@
     /**Use OWB Specific XML Configuration or Strict Spec XML*/
     public static final String USE_OWB_SPECIFIC_XML_CONFIGURATION = "org.apache.webbeans.useOwbSpecificXmlConfig";
     
+    /**Use OWB Specific Field Injection*/
+    public static final String USE_OWB_SPECIFIC_FIELD_INJECTION = "org.apache.webbeans.fieldInjection.useOwbSpecificInjection";    
+    
     /**Use EJB Discovery or not*/
     public static final String USE_EJB_DISCOVERY = "org.apache.webbeans.spi.deployer.UseEjbMetaDataDiscoveryService";
     
@@ -128,4 +131,11 @@
         return configProperties.getProperty(key, defaultValue);
     }
     
+    public boolean isOwbSpecificFieldInjection()
+    {
+        String value = getProperty(USE_OWB_SPECIFIC_FIELD_INJECTION);
+        
+        return Boolean.valueOf(value);
+    }
+    
 }

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -39,7 +39,7 @@
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observer;
 import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.AnnotatedType;
@@ -903,7 +903,7 @@
         if (rawType.equals(InjectionPoint.class))
         {
             Annotated annotated = injectionPoint.getAnnotated();
-            if (annotated.getAnnotations().size() == 1 && annotated.isAnnotationPresent(Current.class))
+            if (annotated.getAnnotations().size() == 1 && annotated.isAnnotationPresent(Default.class))
             {
                 if (!bean.getScopeType().equals(Dependent.class))
                 {

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -58,5 +58,8 @@
 #use OWB Specific XML Configuration
 org.apache.webbeans.useOwbSpecificXmlConfig=false
 
+#use OWB Specific injection. If true, uses spec. defined injection with @Inject
+org.apache.webbeans.fieldInjection.useOwbSpecificInjection=false
+
 #conversation service
 org.apache.webbeans.spi.conversation.ConversationService=org.apache.webbeans.spi.conversation.jsf.JSFConversationServiceImpl
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/NonBindingAnnotationType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/NonBindingAnnotationType.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/NonBindingAnnotationType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/annotation/binding/NonBindingAnnotationType.java Sun Aug 30 14:53:37 2009
@@ -18,12 +18,12 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.inject.Qualifier;
 
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 @Target( { ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER })
 public @interface NonBindingAnnotationType {
-    Current currenr();
+    Default currenr();
 }

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -14,15 +14,15 @@
 package org.apache.webbeans.test.component;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 @Production
 @RequestScoped
 public class ContainUserComponent
 {
-    @Current
-    UserComponent user;
+    @Inject @Default UserComponent user;
 
     public String echo()
     {

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -14,15 +14,15 @@
 package org.apache.webbeans.test.component;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 @RequestScoped
 @Production
 public class ContaintsCurrentComponent
 {
-    @Current
-    CurrentBindingComponent comp;
+    @Inject @Default CurrentBindingComponent comp;
 
     public CurrentBindingComponent getInstance()
     {

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -15,8 +15,9 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Disposes;
+import javax.inject.Inject;
 import javax.inject.Named;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.deployment.Production;
@@ -29,11 +30,11 @@
 @Named
 public class DisposalMethodComponent
 {
-    private @Current IService service = null;
+    private @Inject @Default IService service = null;
 
     @Produces
     @ApplicationScoped
-    @Current
+    @Default
     @Named
     public IService getService(@Binding1 IService service)
     {
@@ -47,7 +48,7 @@
         return this.service;
     }
 
-    public void dispose(@Disposes @Current IService service)
+    public void dispose(@Disposes @Default IService service)
     {
         service = null;
         this.service = null;

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -13,17 +13,17 @@
 import java.util.List;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 @Production
 @RequestScoped
 public class InjectedTypeLiteralComponent
 {
-    private @Current
-    ITypeLiteralComponent<List<String>> component;
+    private @Inject @Default ITypeLiteralComponent<List<String>> component;
     
-    private @Current ITypeLiteralComponent eraseComponent;
+    private @Inject @Default ITypeLiteralComponent eraseComponent;
 
     public 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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -17,6 +17,7 @@
 
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.AnnotationWithBindingMember;
 import org.apache.webbeans.test.annotation.binding.AnnotationWithNonBindingMember;
@@ -26,8 +27,7 @@
 @SessionScoped
 public class NonBindingComponent implements Serializable
 {
-    private @AnnotationWithBindingMember(number = 3, value = "B")
-    BindingComponent comp;
+    private @Inject @AnnotationWithBindingMember(number = 3, value = "B") BindingComponent comp;
 
     public BindingComponent getComponent()
     {

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
 import javax.inject.Inject;
 
@@ -22,7 +22,7 @@
 
 @RequestScoped
 @Production
-@Current
+@Default
 public class PaymentProcessorComponent
 {
     private IPayment paymentCheck;

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -16,6 +16,7 @@
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Check;
 
@@ -23,8 +24,7 @@
 @RequestScoped
 public class PostConstructComponent
 {
-    private @Check(type = "CHECK")
-    IPayment payment;
+    private @Inject @Check(type = "CHECK") IPayment payment;
 
     @SuppressWarnings("unused")
     private IPayment p = null;

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -16,6 +16,7 @@
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 import javax.interceptor.Interceptors;
 
 import org.apache.webbeans.test.annotation.binding.Check;
@@ -27,13 +28,12 @@
 @Interceptors(value = { Interceptor1.class, Interceptor2.class })
 public class PostConstructDoubleInterceptorComponent
 {
-    private @Check(type = "CHECK")
-    IPayment payment;
+    private @Inject @Check(type = "CHECK") IPayment payment;
 
     @SuppressWarnings("unused")
     private IPayment p = null;
 
-    public static String setininterceptor2 = null;
+    static String setininterceptor2 = null;
 
     @PostConstruct
     public void init()
@@ -51,4 +51,10 @@
     {
         return setininterceptor2;
     }
+    
+    public static void setValue(String s)
+    {
+        setininterceptor2 = s;
+    }
+    
 }

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -16,6 +16,7 @@
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 import javax.interceptor.Interceptors;
 
 import org.apache.webbeans.test.annotation.binding.Check;
@@ -26,8 +27,7 @@
 @Interceptors(value = { PostConstructInterceptor.class })
 public class PostConstructInterceptorComponent
 {
-    private @Check(type = "CHECK")
-    IPayment payment;
+    private @Inject @Check(type = "CHECK") IPayment payment;
 
     @SuppressWarnings("unused")
     private IPayment p = null;

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -17,6 +17,7 @@
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Check;
 
@@ -24,8 +25,7 @@
 @RequestScoped
 public class PreDestroyComponent
 {
-    private @Check(type = "CHECK")
-    IPayment payment;
+    private @Inject @Check(type = "CHECK") IPayment payment;
 
     private IPayment p = 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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -23,7 +23,7 @@
 @RequestScoped
 public class TypeLiteralComponent implements ITypeLiteralComponent<List<String>>
 {
-    public static String STR = "";
+    static String STR = "";
 
     @Inject
     public TypeLiteralComponent()
@@ -31,4 +31,9 @@
         super();
         STR = "GURKAN";
     }
+    
+    public static String getSTR()
+    {
+        return STR;
+    }
 }

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -14,14 +14,14 @@
 package org.apache.webbeans.test.component.binding;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
 
 import org.apache.webbeans.test.annotation.binding.NonBindingAnnotationType;
 
 @Production
 @RequestScoped
-@NonBindingAnnotationType(currenr = @Current)
+@NonBindingAnnotationType(currenr = @Default)
 public class BindingWithNonBindingAnnotationTypeComponent
 {
 

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -16,14 +16,14 @@
 import java.math.BigDecimal;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.inject.Named;
 import javax.enterprise.inject.deployment.Production;
 
 @Production
 @Named
 @RequestScoped
-@Current
+@Default
 public class AccountComponent implements Account
 {
     private BigDecimal amount;

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -19,13 +19,13 @@
 import javax.decorator.Decorator;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 
 @Decorator
 @RequestScoped
 public abstract class LargeTransactionDecorator implements Account
 {
-    @Decorates @Any @Current
+    @Decorates @Any @Default
     Account account;
 
     BigDecimal depositeAmount = 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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -17,7 +17,7 @@
 import javax.decorator.Decorator;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.inject.Named;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
@@ -26,7 +26,7 @@
 @Decorator
 @Named
 @RequestScoped
-@Current
+@Default
 public abstract class ServiceDecorator implements IService
 {
     @Decorates @Any @Binding1

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -14,15 +14,15 @@
 package org.apache.webbeans.test.component.dependent;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 @Production
 @RequestScoped
 public class DependentOwnerComponent
 {
-    private @Current
-    DependentComponent dependentComponent;
+    private @Inject @Default DependentComponent dependentComponent;
 
     public DependentComponent getDependent()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/MultipleDependentComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/MultipleDependentComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/MultipleDependentComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/MultipleDependentComponent.java Sun Aug 30 14:53:37 2009
@@ -17,14 +17,15 @@
 package org.apache.webbeans.test.component.dependent;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
 
 @RequestScoped
 public class MultipleDependentComponent
 {
-    @Current DependentComponent dependent1;
+    @Inject @Default DependentComponent dependent1;
     
-    @Current DependentComponent dependent2;
+    @Inject @Default DependentComponent dependent2;
 
     public MultipleDependentComponent()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentA.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentA.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentA.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentA.java Sun Aug 30 14:53:37 2009
@@ -14,13 +14,13 @@
 package org.apache.webbeans.test.component.dependent.circular;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
 
 @RequestScoped
 public class DependentA
 {
-    private @Current
-    DependentB dependentB;
+    private @Inject @Default DependentB dependentB;
 
     public DependentA()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentB.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentB.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentB.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/dependent/circular/DependentB.java Sun Aug 30 14:53:37 2009
@@ -13,11 +13,11 @@
  */
 package org.apache.webbeans.test.component.dependent.circular;
 
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 
 public class DependentB
 {
-    private @Current DependentA dependentA;
+    private @Default DependentA dependentA;
 
     public DependentB()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/disposal/Disposal1.java Sun Aug 30 14:53:37 2009
@@ -29,12 +29,17 @@
 @SessionScoped
 public class Disposal1 implements Serializable
 {
-    public static boolean disposeCall = false;
+    static boolean disposeCall = false;
 
     public Disposal1()
     {
 
     }
+    
+    public static boolean getDISPOSCALL()
+    {
+        return disposeCall;
+    }
 
     @Produces
     @Binding1

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=809349&r1=809348&r2=809349&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 Aug 30 14:53:37 2009
@@ -16,17 +16,18 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.event.LoggedInEvent;
 
 @RequestScoped
 @Production
-@Current
+@Default
 public class ComponentWithObservable1
 {
-    private @Any Event<LoggedInEvent> event;
+    private @Inject @Any Event<LoggedInEvent> event;
 
     public void afterLoggedIn()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/normal/ComponentWithObserves1.java Sun Aug 30 14:53:37 2009
@@ -16,7 +16,7 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.deployment.Production;
 
 import org.apache.webbeans.test.annotation.binding.Check;
@@ -24,7 +24,7 @@
 
 @Production
 @RequestScoped
-@Current
+@Default
 public class ComponentWithObserves1
 {
     private String userName;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/MultipleDisposalMethodComponent.java Sun Aug 30 14:53:37 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.exception;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.deployment.Production;
@@ -29,7 +29,7 @@
 
     @Produces
     @ApplicationScoped
-    @Current
+    @Default
     public IService getService(@Binding1 IService service)
     {
         this.service = service;
@@ -42,13 +42,13 @@
         return this.service;
     }
 
-    public void dispose(@Disposes @Current IService service)
+    public void dispose(@Disposes @Default IService service)
     {
         service = null;
         this.service = null;
     }
 
-    public void dispose2(@Disposes @Current IService service)
+    public void dispose2(@Disposes @Default IService service)
     {
         service = null;
         this.service = null;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java Sun Aug 30 14:53:37 2009
@@ -15,14 +15,13 @@
 
 import javax.enterprise.inject.New;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 
 @Production
 public class NewComponentBindingComponent
 {
-    @New
-    @Binding1
-    String src;
+    @Inject @New @Binding1 String src;
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java Sun Aug 30 14:53:37 2009
@@ -15,13 +15,13 @@
 
 import javax.enterprise.inject.New;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.component.service.IService;
 
 @Production
 public class NewComponentInterfaceComponent
 {
-    @New
-    IService src;
+    @Inject @New IService src;
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/InstanceInjectedComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/InstanceInjectedComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/InstanceInjectedComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/InstanceInjectedComponent.java Sun Aug 30 14:53:37 2009
@@ -18,15 +18,16 @@
 
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.component.PaymentProcessorComponent;
 
 @RequestScoped
 public class InstanceInjectedComponent
 {
-    @Current Instance<PaymentProcessorComponent> instance;
+    @Inject @Default Instance<PaymentProcessorComponent> instance;
     
     public InstanceInjectedComponent()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent1.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent1.java Sun Aug 30 14:53:37 2009
@@ -18,9 +18,10 @@
 
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 
 public class InstanceInjectedBrokenComponent1
 {
-    @Any Instance payment;
+    @Inject @Any Instance payment;
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent2.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent2.java Sun Aug 30 14:53:37 2009
@@ -18,10 +18,11 @@
 
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.component.ITypeLiteralComponent;
 
 public class InstanceInjectedBrokenComponent2
 {
-    @Any Instance<ITypeLiteralComponent<?>> instance;
+    @Inject @Any Instance<ITypeLiteralComponent<?>> instance;
 }

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -18,9 +18,10 @@
 
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 
 public class InstanceInjectedBrokenComponent3
 {
-    @Any Instance<?> instance;
+    @Inject @Any Instance<?> instance;
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent4.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent4.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent4.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/broken/InstanceInjectedBrokenComponent4.java Sun Aug 30 14:53:37 2009
@@ -18,9 +18,10 @@
 
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 @SuppressWarnings("unchecked")
 public class InstanceInjectedBrokenComponent4
 {
-    @Any Instance instance;
+    @Inject @Any Instance instance;
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/generic/GenericComponentInjector.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/generic/GenericComponentInjector.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/generic/GenericComponentInjector.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inject/generic/GenericComponentInjector.java Sun Aug 30 14:53:37 2009
@@ -13,20 +13,21 @@
  */
 package org.apache.webbeans.test.component.inject.generic;
 
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.component.inject.parametrized.Persistent;
 import org.apache.webbeans.test.component.inject.parametrized.PersistentSuper;
 
 public class GenericComponentInjector<Y extends Persistent>
 {
-    private @Current GenericComponent<?> injection1;
+    private @Inject @Default GenericComponent<?> injection1;
     
-    private @Current GenericComponent<? extends PersistentSuper> injection2;
+    private @Inject @Default GenericComponent<? extends PersistentSuper> injection2;
     
-    private @Current GenericComponent<Persistent> injection3;
+    private @Inject @Default GenericComponent<Persistent> injection3;
  
-    private @Current GenericComponent<Y> injection4;
+    private @Inject @Default GenericComponent<Y> injection4;
 
     public GenericComponent<?> getInjection1()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/Interceptor2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/Interceptor2.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/Interceptor2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/Interceptor2.java Sun Aug 30 14:53:37 2009
@@ -37,7 +37,7 @@
         try
         {
             String value = ctx.getContextData().get("key1").toString();
-            PostConstructDoubleInterceptorComponent.setininterceptor2 = value;
+            PostConstructDoubleInterceptorComponent.setValue( value);
 
             ctx.proceed();
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureAndTransactionalComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureAndTransactionalComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureAndTransactionalComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/SecureAndTransactionalComponent.java Sun Aug 30 14:53:37 2009
@@ -27,7 +27,7 @@
 @SessionScoped
 public class SecureAndTransactionalComponent implements Serializable
 {
-    public static boolean CALL = false;
+    static boolean CALL = false;
     
     @Secure2
     public void pay()
@@ -35,4 +35,8 @@
         
     }
 
+    public static boolean getCALL()
+    {
+        return CALL;
+    }
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/ShoppingCard.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/ShoppingCard.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/ShoppingCard.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/ShoppingCard.java Sun Aug 30 14:53:37 2009
@@ -22,7 +22,7 @@
 @SessionScoped
 public class ShoppingCard implements Serializable
 {
-    public static boolean CALLED = false;
+    static boolean CALLED = false;
     
     @Transactional
     public void placeOrder() 
@@ -34,5 +34,9 @@
     { 
         CALLED = false;
     }
-        
+    
+    public static boolean getCALLED()
+    {
+        return CALLED;
+    }
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WInterceptorComponent.java Sun Aug 30 14:53:37 2009
@@ -23,9 +23,9 @@
 @RequestScoped
 public class WInterceptorComponent
 {
-    public static int s = 0;
+    static int s = 0;
 
-    public static int sWithMeta = 0;
+    static int sWithMeta = 0;
 
     public int hello()
     {
@@ -37,4 +37,13 @@
         return sWithMeta;
     }
 
+    public static int getS()
+    {
+        return s;
+    }
+    
+    public static int getSWITHMETA()
+    {
+        return sWithMeta;
+    }
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/WMetaInterceptorComponent.java Sun Aug 30 14:53:37 2009
@@ -23,9 +23,9 @@
 @RequestScoped
 public class WMetaInterceptorComponent
 {
-    public static int s = 0;
+    static int s = 0;
 
-    public static int sWithMeta = 0;
+    static int sWithMeta = 0;
 
     public int hello()
     {
@@ -36,5 +36,14 @@
     {
         return sWithMeta;
     }
+    
+    public static int getS()
+    {
+        return s;
+    }
 
+    public static int getSWITHMETA()
+    {
+        return sWithMeta;
+    }
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/newcomp/NewComponent.java Sun Aug 30 14:53:37 2009
@@ -15,14 +15,14 @@
 
 import javax.enterprise.inject.New;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.component.dependent.DependentOwnerComponent;
 
 @Production
 public class NewComponent
 {
-    @New
-    DependentOwnerComponent owner;
+    @Inject @New DependentOwnerComponent owner;
 
     public DependentOwnerComponent owner()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldDefinitionComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldDefinitionComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldDefinitionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldDefinitionComponent.java Sun Aug 30 14:53:37 2009
@@ -17,7 +17,7 @@
 package org.apache.webbeans.test.component.pfield;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
@@ -35,7 +35,7 @@
     }
     
     @Inject
-    public ProducerFieldDefinitionComponent(@Current PaymentProcessorComponent paymentProcessor)
+    public ProducerFieldDefinitionComponent(@Default PaymentProcessorComponent paymentProcessor)
     {
         this.paymentProcessor = paymentProcessor;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldInjectedComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldInjectedComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldInjectedComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/pfield/ProducerFieldInjectedComponent.java Sun Aug 30 14:53:37 2009
@@ -17,6 +17,7 @@
 package org.apache.webbeans.test.component.pfield;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Synchronous;
 import org.apache.webbeans.test.component.PaymentProcessorComponent;
@@ -24,7 +25,7 @@
 @RequestScoped
 public class ProducerFieldInjectedComponent
 {
-    private @Synchronous PaymentProcessorComponent paymentProcessor;
+    private @Inject @Synchronous PaymentProcessorComponent paymentProcessor;
     
     public ProducerFieldInjectedComponent()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/PortableType1.java Sun Aug 30 14:53:37 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.portable;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.inject.Named;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
@@ -30,16 +30,16 @@
 import org.apache.webbeans.test.xml.annot.BindingType1;
 import org.apache.webbeans.test.xml.annot.BindingType2;
 
-@Current
+@Default
 @Binding1
 @Binding2
 @Interceptor
 @Named
 public class PortableType1
 {
-    private @Current IPayment payment;
+    private @Default IPayment payment;
     
-    private @Binding2 @Current Book book;
+    private @Binding2 @Default Book book;
     
     private @Produces @BindingType2 CheckWithCheckPayment check;
     

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/events/MyExtension.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/events/MyExtension.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/events/MyExtension.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/portable/events/MyExtension.java Sun Aug 30 14:53:37 2009
@@ -14,7 +14,7 @@
 package org.apache.webbeans.test.component.portable.events;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
@@ -27,7 +27,7 @@
         
     }
 
-    public void observer(@Current @Observes ProcessAnnotatedType<?> annotatedType)
+    public void observer(@Default @Observes ProcessAnnotatedType<?> annotatedType)
     {
         event = annotatedType;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/ParametrizedProducer.java Sun Aug 30 14:53:37 2009
@@ -23,9 +23,9 @@
 @RequestScoped
 public class ParametrizedProducer
 {
-    public static boolean callModel1 = false;
+    static boolean callModel1 = false;
 
-    public static boolean callModel2 = false;
+    static boolean callModel2 = false;
 
     @Produces
     public List<ParametrizedModel1> getModel1()
@@ -40,4 +40,15 @@
         callModel2 = true;
         return null;
     }
+    
+    public static boolean getCALLMODEL1()
+    {
+        return callModel1;
+    }
+    
+    public static boolean getCALLMODEL2()
+    {
+        return callModel2;
+    }
+    
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/Producer4ConsumerComponent.java Sun Aug 30 14:53:37 2009
@@ -17,14 +17,14 @@
 import java.util.List;
 
 import javax.enterprise.context.SessionScoped;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Users;
 
 @SessionScoped
 public class Producer4ConsumerComponent implements Serializable
-{
-    @Users
-    private List<User> users;
+{    
+    private @Inject @Users List<User> users;
 
     public int count()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/producer/primitive/PrimitiveConsumer.java Sun Aug 30 14:53:37 2009
@@ -17,6 +17,7 @@
 package org.apache.webbeans.test.component.producer.primitive;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
@@ -26,7 +27,7 @@
 @Named
 public class PrimitiveConsumer
 {
-    private @Binding1 @Binding2 Float primitiveProducer;
+    private @Inject @Binding1 @Binding2 Float primitiveProducer;
     
     public PrimitiveConsumer()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/Producer1ConsumerComponent.java Sun Aug 30 14:53:37 2009
@@ -14,6 +14,7 @@
 package org.apache.webbeans.test.component.service;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.inject.Named;
 import javax.enterprise.inject.deployment.Production;
 
@@ -24,8 +25,7 @@
 @Named
 public class Producer1ConsumerComponent
 {
-    private @ProducerBinding1
-    IService service;
+    private @Inject @ProducerBinding1 IService service;
 
     public IService getService()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjection.java Sun Aug 30 14:53:37 2009
@@ -17,6 +17,7 @@
 
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;
@@ -25,9 +26,7 @@
 @SessionScoped
 public class TypedInjection implements Serializable
 {
-    public @Binding1
-    @Binding2
-    ITyped2<String, Object> v = null;
+    @Inject @Binding1 @Binding2 ITyped2<String, Object> v = null;
 
     public ITyped2<String, Object> getV()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/service/TypedInjectionWithoutArguments.java Sun Aug 30 14:53:37 2009
@@ -17,6 +17,7 @@
 
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.deployment.Production;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Binding1;
 import org.apache.webbeans.test.annotation.binding.Binding2;
@@ -26,9 +27,7 @@
 @SuppressWarnings("unchecked")
 public class TypedInjectionWithoutArguments implements Serializable
 {
-    public @Binding1
-    @Binding2
-    ITyped2 v = null;
+    @Inject @Binding1 @Binding2 ITyped2 v = null;
 
     public ITyped2<String, Object> getV()
     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/AsynhrounousSpecalizesService.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/AsynhrounousSpecalizesService.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/AsynhrounousSpecalizesService.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/AsynhrounousSpecalizesService.java Sun Aug 30 14:53:37 2009
@@ -17,12 +17,12 @@
 package org.apache.webbeans.test.component.specializes;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.inject.Named;
 
 import org.apache.webbeans.test.annotation.binding.Asynchronous;
 
-@Current @Asynchronous @Named("asyncService") @RequestScoped
+@Default @Asynchronous @Named("asyncService") @RequestScoped
 public class AsynhrounousSpecalizesService implements ServiceForSpecializes
 {
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/SpecializesServiceInjectorComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/SpecializesServiceInjectorComponent.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/SpecializesServiceInjectorComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/specializes/SpecializesServiceInjectorComponent.java Sun Aug 30 14:53:37 2009
@@ -17,14 +17,15 @@
 package org.apache.webbeans.test.component.specializes;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
 
 import org.apache.webbeans.test.annotation.binding.Asynchronous;
 
 @RequestScoped
 public class SpecializesServiceInjectorComponent
 {
-    @Current @Asynchronous ServiceForSpecializes service;
+    @Inject @Default @Asynchronous ServiceForSpecializes service;
     
     public SpecializesServiceInjectorComponent()
     {

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -100,8 +100,8 @@
 
         List<ParametrizedModel1> instance = getManager().getInstanceByType(model1, new Annotation[0]);
         Assert.assertNull(instance);
-        Assert.assertTrue(ParametrizedProducer.callModel1);
-        Assert.assertTrue(!ParametrizedProducer.callModel2);
+        Assert.assertTrue(ParametrizedProducer.getCALLMODEL1());
+        Assert.assertTrue(!ParametrizedProducer.getCALLMODEL2());
 
         TypeLiteral<List<ParametrizedModel2>> model2 = new TypeLiteral<List<ParametrizedModel2>>()
         {
@@ -109,7 +109,7 @@
         List<ParametrizedModel2> instance2 = getManager().getInstanceByType(model2, new Annotation[0]);
 
         Assert.assertNull(instance2);
-        Assert.assertTrue(ParametrizedProducer.callModel2);
+        Assert.assertTrue(ParametrizedProducer.getCALLMODEL2());
 
     }
 

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -16,7 +16,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.BeanManager;
 
 import junit.framework.Assert;
@@ -52,13 +52,13 @@
         List<AbstractBean<?>> list = getComponents();
 
         @SuppressWarnings("unused")
-        AbstractBean<?> itype = (AbstractBean<?>) getManager().resolveByType(TypedComponentTest.class.getDeclaredField("s").getType(), new Current()
+        AbstractBean<?> itype = (AbstractBean<?>) getManager().resolveByType(TypedComponentTest.class.getDeclaredField("s").getType(), new Default()
         {
 
             public Class<? extends Annotation> annotationType()
             {
 
-                return Current.class;
+                return Default.class;
             }
 
         }).iterator().next();

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=809349&r1=809348&r2=809349&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 Sun Aug 30 14:53:37 2009
@@ -53,7 +53,7 @@
         Assert.assertTrue(list.size() == 1);
         ContextFactory.destroyRequestContext(null);
 
-        Assert.assertTrue(Disposal1.disposeCall);
+        Assert.assertTrue(Disposal1.getDISPOSCALL());
 
     }
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java Sun Aug 30 14:53:37 2009
@@ -71,8 +71,8 @@
 
         Assert.assertEquals(5, stack.size());
 
-        Assert.assertNotNull(PostConstructDoubleInterceptorComponent.setininterceptor2);
-        Assert.assertEquals("value1", PostConstructDoubleInterceptorComponent.setininterceptor2);
+        Assert.assertNotNull(PostConstructDoubleInterceptorComponent.getValue());
+        Assert.assertEquals("value1", PostConstructDoubleInterceptorComponent.getValue());
 
         ContextFactory.destroyRequestContext(null);
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java?rev=809349&r1=809348&r2=809349&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java Sun Aug 30 14:53:37 2009
@@ -52,11 +52,11 @@
         Bean<SecureAndTransactionalComponent> bean = defineSimpleWebBean(SecureAndTransactionalComponent.class);
         SecureAndTransactionalComponent payment = getManager().getInstance(bean);
         
-        Assert.assertFalse(SecureAndTransactionalComponent.CALL);
+        Assert.assertFalse(SecureAndTransactionalComponent.getCALL());
         
         payment.pay();
         
-        Assert.assertTrue(SecureAndTransactionalComponent.CALL);
+        Assert.assertTrue(SecureAndTransactionalComponent.getCALL());
         
                 
         ContextFactory.destroySessionContext(new MockHttpSession());



Mime
View raw message