openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r811507 [2/3] - in /incubator/openwebbeans/trunk: ./ samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/ webbeans-api/src/main/java/javax/enterprise/context/spi/ webbeans-api/src/main/java/javax/enterprise/e...
Date Fri, 04 Sep 2009 18:18:45 GMT
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java Fri Sep  4 18:18:41 2009
@@ -83,17 +83,17 @@
         }
         else
         {
-            Set<Annotation> bindings = bean.getBindings();
+            Set<Annotation> qualifiers = bean.getQualifiers();
             Set<Type> apiTypes = bean.getTypes();
             
             Set<Bean<?>> beans = parent.getBeans();
             boolean found = false;
             for(Bean<?> b : beans)
             {
-                Set<Annotation> parentBindings = b.getBindings();
+                Set<Annotation> parentQualifiers = b.getQualifiers();
                 Set<Type> parentApiTypes = b.getTypes();
                 
-                if(parentBindings.containsAll(bindings))
+                if(parentQualifiers.containsAll(qualifiers))
                 {
                     for(Type t : apiTypes)
                     {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Fri Sep  4 18:18:41 2009
@@ -126,12 +126,12 @@
             clazz = (Class<?>) type;
         }
         
-        Annotation[] bindingTypes = new Annotation[injectionPoint.getBindings().size()];
-        bindingTypes = injectionPoint.getBindings().toArray(bindingTypes);
+        Annotation[] qualifiers = new Annotation[injectionPoint.getQualifiers().size()];
+        qualifiers = injectionPoint.getQualifiers().toArray(qualifiers);
         
-        Set<Bean<?>> beanSet = implResolveByType(type ,bindingTypes);
+        Set<Bean<?>> beanSet = implResolveByType(type, qualifiers);
         
-        ResolutionUtil.checkResolvedBeans(beanSet, clazz, bindingTypes);
+        ResolutionUtil.checkResolvedBeans(beanSet, clazz, qualifiers);
         
         Bean<?> bean = beanSet.iterator().next();
         
@@ -168,13 +168,13 @@
             clazz = (Class<?>) type;
         }
         
-        Annotation[] bindingTypes = new Annotation[injectionPoint.getBindings().size()];
-        bindingTypes = injectionPoint.getBindings().toArray(bindingTypes);
-        
-        Set<Bean<?>> beanSet = implResolveByType(type ,bindingTypes);
-        
-        ResolutionUtil.checkResolvedBeans(beanSet, clazz, bindingTypes);
-        
+        Annotation[] qualifiers = new Annotation[injectionPoint.getQualifiers().size()];
+        qualifiers = injectionPoint.getQualifiers().toArray(qualifiers);
+
+        Set<Bean<?>> beanSet = implResolveByType(type, qualifiers);
+
+        ResolutionUtil.checkResolvedBeans(beanSet, clazz, qualifiers);
+
         return beanSet.iterator().next();
         
     }    
@@ -272,28 +272,28 @@
      * @param <T> bean type info
      * @param injectionPointType injection point api type
      * @param injectionPointTypeArguments actual type arguments if parameterized type
-     * @param binding binding type of the injection point
+     * @param qualifier qualifier of the injection point
      * @return set of resolved beans
      */
-    public Set<Bean<?>> implResolveByType(Type injectionPointType, Annotation... binding)
+    public Set<Bean<?>> implResolveByType(Type injectionPointType, Annotation... qualifier)
     {
         Asserts.assertNotNull(injectionPointType, "injectionPointType parameter can not be null");
-        Asserts.assertNotNull(binding, "binding parameter can not be null");
+        Asserts.assertNotNull(qualifier, "qualifier parameter can not be null");
         
         Set<Bean<?>> results = new HashSet<Bean<?>>();
         Set<Bean<?>> deployedComponents = this.manager.getBeans();
 
-        boolean currentBinding = false;
+        boolean currentQualifier = false;
         boolean returnAll = false;
 
-        if (binding.length == 0)
+        if (qualifier.length == 0)
         {
-            binding = new Annotation[1];
-            binding[0] = new CurrentLiteral();
-            currentBinding = true;
+            qualifier = new Annotation[1];
+            qualifier[0] = new CurrentLiteral();
+            currentQualifier = true;
         }
         
-        if (injectionPointType.equals(Object.class) && currentBinding)
+        if (injectionPointType.equals(Object.class) && currentQualifier)
         {
             returnAll = true;
         }
@@ -327,8 +327,8 @@
             }            
         }
  
-        //Look for binding types
-        results = findByBindingType(results, binding);
+        //Look for qualifiers
+        results = findByQualifier(results, qualifier);
         
         //Look for precedence
         results = findByPrecedence(results);
@@ -420,14 +420,14 @@
     }
 
     /**
-     * Returns filtered bean set according to the binding types.
+     * Returns filtered bean set according to the qualifiers.
      * 
      * @param <T> bean class
-     * @param remainingSet bean set for filtering by binding type
-     * @param annotations binding types on injection point
-     * @return filtered bean set according to the binding types
+     * @param remainingSet bean set for filtering by qualifier
+     * @param annotations qualifiers on injection point
+     * @return filtered bean set according to the qualifiers
      */
-    private Set<Bean<?>> findByBindingType(Set<Bean<?>> remainingSet, Annotation... annotations)
+    private Set<Bean<?>> findByQualifier(Set<Bean<?>> remainingSet, Annotation... annotations)
     {
         Iterator<Bean<?>> it = remainingSet.iterator();
         Set<Bean<?>> result = new HashSet<Bean<?>>();
@@ -435,18 +435,18 @@
         while (it.hasNext())
         {
             Bean<?> component = it.next();
-            Set<Annotation> bTypes = component.getBindings();
+            Set<Annotation> qTypes = component.getQualifiers();
 
             int i = 0;
             for (Annotation annot : annotations)
             {
-                Iterator<Annotation> itBindingTypes = bTypes.iterator();
-                while (itBindingTypes.hasNext())
+                Iterator<Annotation> itQualifiers = qTypes.iterator();
+                while (itQualifiers.hasNext())
                 {
-                    Annotation bindingType = itBindingTypes.next();
-                    if (annot.annotationType().equals(bindingType.annotationType()))
+                    Annotation qualifier = itQualifiers.next();
+                    if (annot.annotationType().equals(qualifier.annotationType()))
                     {
-                        if (AnnotationUtil.isAnnotationMemberExist(bindingType.annotationType(), bindingType, annot))
+                        if (AnnotationUtil.isAnnotationMemberExist(qualifier.annotationType(), qualifier, annot))
                         {
                             i++;
                         }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java Fri Sep  4 18:18:41 2009
@@ -62,25 +62,25 @@
         }
     }
 
-    public static void getInstanceByTypeConditions(Annotation[] bindingTypes)
+    public static void getInstanceByTypeConditions(Annotation[] qualifiers)
     {
-        AnnotationUtil.checkBindingTypeConditions(bindingTypes);
+        AnnotationUtil.checkQualifierConditions(qualifiers);
     }
 
-    public static void checkResolvedBeans(Set<Bean<?>> resolvedSet, Class<?> type, Annotation[] bindingTypes)
+    public static void checkResolvedBeans(Set<Bean<?>> resolvedSet, Class<?> type, Annotation[] qualifiers)
     {
         if (resolvedSet.isEmpty())
         {
-            StringBuffer message = new StringBuffer("Api type [" + type.getName() + "] is not found with the binding types [");
+            StringBuffer message = new StringBuffer("Api type [" + type.getName() + "] is not found with the qualifiers [");
             
             int i = 0;
-            for(Annotation annot : bindingTypes)
+            for(Annotation annot : qualifiers)
             {
                 i++;
                 
                 message.append(annot);
                 
-                if(i != bindingTypes.length)
+                if(i != qualifiers.length)
                 {
                     message.append(",");   
                 }
@@ -97,7 +97,7 @@
         }
 
         Bean<?> bean = resolvedSet.iterator().next();
-        WebBeansUtil.checkUnproxiableApiType(bean, bean.getScopeType());
+        WebBeansUtil.checkUnproxiableApiType(bean, bean.getScope());
 
     }
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Fri Sep  4 18:18:41 2009
@@ -266,7 +266,7 @@
     /**
      * {@inheritDoc}
      */
-    public Class<? extends Annotation> getScopeType()
+    public Class<? extends Annotation> getScope()
     {
 
         return this.scopeType;
@@ -284,7 +284,7 @@
     {
         if (!active)
         {
-            throw new ContextNotActiveException("WebBeans context with scope type annotation @" + getScopeType().getName() + " is not active with respect to the current thread");
+            throw new ContextNotActiveException("WebBeans context with scope annotation @" + getScope().getName() + " is not active with respect to the current thread");
         }        
     }
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java Fri Sep  4 18:18:41 2009
@@ -31,9 +31,9 @@
         this.context = context;
     }
     
-    public Class<? extends Annotation> getScopeType()
+    public Class<? extends Annotation> getScope()
     {
-        return this.context.getScopeType();
+        return this.context.getScope();
     }
 
     public <T> T get(Contextual<T> component, CreationalContext<T> crreationalContext)
@@ -50,5 +50,5 @@
     {
         return this.context.isActive();
     }
-    
+
 }

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -132,7 +132,7 @@
     {
         Asserts.assertNotNull("component", "component parameter can not be null");
 
-        Set<Annotation> annSet = component.getBindings();
+        Set<Annotation> annSet = component.getQualifiers();
         Annotation[] anns = new Annotation[annSet.size()];
         anns = annSet.toArray(anns);
 

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -59,8 +59,8 @@
     /** Delegate field class type */
     protected Type delegateType;
 
-    /** Delegate field binding types */
-    protected Set<Annotation> delegateBindingTypes = new HashSet<Annotation>();
+    /** Delegate field bindings */
+    protected Set<Annotation> delegateBindings = new HashSet<Annotation>();
 
     /** Wrapped bean*/
     private AbstractBean<T> wrappedBean;
@@ -133,9 +133,9 @@
 
         for (Annotation ann : anns)
         {
-            if (AnnotationUtil.isBindingAnnotation(ann.annotationType()))
+            if (AnnotationUtil.isQualifierAnnotation(ann.annotationType()))
             {
-                this.delegateBindingTypes.add(ann);
+                this.delegateBindings.add(ann);
             }
         }
         
@@ -160,7 +160,7 @@
             for (Annotation annot : annotation)
             {
                 boolean bindingOk = false;
-                for (Annotation bindingType : delegateBindingTypes)
+                for (Annotation bindingType : delegateBindings)
                 {
                     if (AnnotationUtil.isAnnotationMemberExist(bindingType.annotationType(), annot, bindingType))
                     {
@@ -190,9 +190,9 @@
     }
 
     @Override
-    public Set<Annotation> getDelegateBindingTypes()
+    public Set<Annotation> getDelegateBindings()
     {
-        return delegateBindingTypes;
+        return delegateBindings;
     }
 
     @Override
@@ -271,9 +271,9 @@
     }
 
     @Override
-    public Set<Annotation> getBindings()
+    public Set<Annotation> getQualifiers()
     {
-        return wrappedBean.getBindings();
+        return wrappedBean.getQualifiers();
     }
 
     @Override
@@ -289,9 +289,9 @@
     }
 
     @Override
-    public Class<? extends Annotation> getScopeType()
+    public Class<? extends Annotation> getScope()
     {
-        return wrappedBean.getScopeType();
+        return wrappedBean.getScope();
     }
 
     
@@ -393,5 +393,5 @@
         return this.wrappedBean.isAlternative();
     }
 
- 
+
 }
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java Fri Sep  4 18:18:41 2009
@@ -64,9 +64,9 @@
 
     public static void configureDecarotors(AbstractBean<?> component, Object instance)
     {
-        Set<Annotation> bindingTypes = component.getBindings();
-        Annotation[] anns = new Annotation[bindingTypes.size()];
-        anns = bindingTypes.toArray(anns);
+        Set<Annotation> qualifiers = component.getQualifiers();
+        Annotation[] anns = new Annotation[qualifiers.size()];
+        anns = qualifiers.toArray(anns);
 
         List<Decorator<?>> decoratorList = BeanManagerImpl.getManager().resolveDecorators(component.getTypes(), anns);
         Iterator<Decorator<?>> itList = decoratorList.iterator();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java Fri Sep  4 18:18:41 2009
@@ -35,7 +35,7 @@
     protected void initDelegate()
     {
         this.delegateType = decoratesModel.getInjectionClassType();
-        this.delegateBindingTypes = decoratesModel.getBindingTypes();
+        this.delegateBindings = decoratesModel.getBindingTypes();
     }
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java Fri Sep  4 18:18:41 2009
@@ -109,7 +109,7 @@
 
                     if (type.length != 1 && !type[0].equals(ElementType.TYPE))
                     {
-                        throw new WebBeansConfigurationException(errorMessage + "Stereotype with @InterceptorBindingType must be defined as @Target{TYPE}");
+                        throw new WebBeansConfigurationException(errorMessage + "Stereotype with @InterceptorBinding must be defined as @Target{TYPE}");
                     }
 
                     interceptorBindingTypes.add(XMLUtil.getXMLDefinedAnnotationMember(child, annClazz, errorMessage));
@@ -123,9 +123,9 @@
                         throw new WebBeansConfigurationException(errorMessage + "@StereoType annotation can not define @Named annotation with value");
                     }
                 }
-                else if (AnnotationUtil.isBindingAnnotation(annClazz))
+                else if (AnnotationUtil.isQualifierAnnotation(annClazz))
                 {
-                    throw new WebBeansConfigurationException(errorMessage + "@StereoType annotation can not define @BindingType annotation");
+                    throw new WebBeansConfigurationException(errorMessage + "@StereoType annotation can not define @Qualifier annotation");
                 }
 
                 else if (AnnotationUtil.isStereoTypeAnnotation(annClazz))

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java Fri Sep  4 18:18:41 2009
@@ -128,7 +128,7 @@
     @SuppressWarnings("unchecked")
     private <T> void destroyBean(Bean<T> bean, Object instance)
     {
-        if (bean.getScopeType().equals(Dependent.class))
+        if (bean.getScope().equals(Dependent.class))
         {
             T inst = (T) instance;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java Fri Sep  4 18:18:41 2009
@@ -50,7 +50,7 @@
  *  }
  * </pre>
  * Above class X instance observes for the event with type <code>LoggedInEvent</code>
- * and event binding type is <code>Current</code>. Whenever event is fired, its {@link Observer#notify()}
+ * and event qualifier is <code>Current</code>. Whenever event is fired, its {@link Observer#notify()}
  * method is called.
  * </p>
  * 
@@ -105,7 +105,7 @@
         {
             BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
             specializedComponent = (AbstractBean<Object>)WebBeansUtil.getMostSpecializedBean(manager, baseComponent);        
-            Context context = manager.getContext(specializedComponent.getScopeType());
+            Context context = manager.getContext(specializedComponent.getScope());
             
             if(this.ifExist)
             {
@@ -158,7 +158,7 @@
         }
         finally
         {
-            if (baseComponent.getScopeType().equals(Dependent.class))
+            if (baseComponent.getScope().equals(Dependent.class))
             {
                 baseComponent.destroy(object,baseComponent.getCreationalContext());
             }
@@ -212,7 +212,7 @@
                 if (!observesAnnotation)
                 {
                     //Get parameter annotations
-                    Annotation[] bindingTypes = AnnotationUtil.getBindingAnnotations(annot);
+                    Annotation[] bindingTypes = AnnotationUtil.getQualifierAnnotations(annot);
 
                     if (bindingTypes.length > 0)
                     {

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -73,7 +73,7 @@
      */
     private Annotation[] getEventBindings(Annotation... annotations)
     {
-        AnnotationUtil.checkBindingTypeConditions(annotations);
+        AnnotationUtil.checkQualifierConditions(annotations);
         
         List<Annotation> eventBindings = new ArrayList<Annotation>();
         Annotation[] anns = null;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java Fri Sep  4 18:18:41 2009
@@ -50,7 +50,7 @@
 
     public static void checkEventBindings(Annotation... annotations)
     {
-        AnnotationUtil.checkBindingTypeConditions(annotations);
+        AnnotationUtil.checkQualifierConditions(annotations);
     }
 
     public static TransactionalObserverType getObserverMethodTransactionType(Method observerMethod)

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -24,7 +24,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import javax.enterprise.event.Notify;
+import javax.enterprise.event.Reception;
 import javax.enterprise.event.Observer;
 import javax.enterprise.event.ObserverException;
 import javax.enterprise.event.Observes;
@@ -119,7 +119,7 @@
                 ObserverWrapper<?> s = it.next();
                 Observer<T> ob = (Observer<T>) s.getObserver();
 
-                Set<Annotation> evenBindings = s.getEventBindingTypes();
+                Set<Annotation> evenBindings = s.getEventQualifiers();
                 Annotation[] anns = new Annotation[evenBindings.size()];
                 anns = evenBindings.toArray(anns);
                 
@@ -145,7 +145,7 @@
                 ObserverWrapper<?> s = it.next();
                 Observer<T> ob = (Observer<T>) s.getObserver();
 
-                Set<Annotation> evenBindings = s.getEventBindingTypes();
+                Set<Annotation> evenBindings = s.getEventQualifiers();
                 Annotation[] anns = new Annotation[evenBindings.size()];
                 anns = evenBindings.toArray(anns);
                 
@@ -194,7 +194,7 @@
         {
             ObserverWrapper<T> impl = (ObserverWrapper<T>) it.next();
 
-            if (impl.isObserverOfBindings(bindings))
+            if (impl.isObserverOfQualifiers(bindings))
             {
                 unres.add(impl.getObserver());
             }
@@ -301,11 +301,11 @@
             Method observableMethod = itMethods.next();
             Observes observes = AnnotationUtil.getMethodFirstParameterAnnotation(observableMethod, Observes.class);
             
-            Annotation[] bindingTypes = AnnotationUtil.getMethodFirstParameterBindingTypesWithGivenAnnotation(observableMethod, Observes.class);
+            Annotation[] bindingTypes = AnnotationUtil.getMethodFirstParameterQualifierWithGivenAnnotation(observableMethod, Observes.class);
             
             boolean ifExist = false;
 
-            if (observes.notifyObserver().equals(Notify.IF_EXISTS))
+            if (observes.notifyObserver().equals(Reception.IF_EXISTS))
             {
                 ifExist = true;
             }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverWrapper.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverWrapper.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverWrapper.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverWrapper.java Fri Sep  4 18:18:41 2009
@@ -29,7 +29,7 @@
 public class ObserverWrapper<T>
 {
     /** Event binding types apeearing on the parameter */
-    private Set<Annotation> eventBindingTypes = new HashSet<Annotation>();
+    private Set<Annotation> eventQualifiers = new HashSet<Annotation>();
 
     /** Event object type */
     private Type eventType;
@@ -59,7 +59,7 @@
     {
         for (Annotation annotation : annotations)
         {
-            this.eventBindingTypes.add(annotation);
+            this.eventQualifiers.add(annotation);
         }
 
         this.observer = observer;
@@ -68,15 +68,15 @@
         this.transObserverType = type;
     }
 
-    public boolean isObserverOfBindings(Annotation... annotations)
+    public boolean isObserverOfQualifiers(Annotation... annotations)
     {
         boolean ok = true;
                 
-        if(this.eventBindingTypes.size() >= annotations.length)
+        if(this.eventQualifiers.size() >= annotations.length)
         {
             for (Annotation annot : annotations)
             {
-                if (!this.eventBindingTypes.contains(annot))
+                if (!this.eventQualifiers.contains(annot))
                 {
                     ok = false;
                     break;
@@ -92,7 +92,7 @@
                 eventAnnots.add(eventAnnot);
             }
             
-            for (Annotation annot : this.eventBindingTypes)
+            for (Annotation annot : this.eventQualifiers)
             {
                 if (!eventAnnots.contains(annot))
                 {
@@ -111,9 +111,9 @@
     /**
      * Gets event binding types.
      */
-    public Set<Annotation> getEventBindingTypes()
+    public Set<Annotation> getEventQualifiers()
     {
-        return this.eventBindingTypes;
+        return this.eventQualifiers;
     }
 
     /**

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Fri Sep  4 18:18:41 2009
@@ -81,7 +81,7 @@
         Bean<?> component = InjectionResolver.getInstance().getInjectionPointBean(injectionPoint);
         
         //Managed @Dependence instances
-        if (component.getScopeType().equals(Dependent.class))
+        if (component.getScope().equals(Dependent.class))
         {
             if(WebBeansUtil.isManagedBean(this.injectionOwnerComponent) || 
                     WebBeansUtil.isEnterpriseBean(this.injectionOwnerComponent))

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java Fri Sep  4 18:18:41 2009
@@ -115,7 +115,7 @@
     {
         InjectionPointImpl injectionPoint = null;
 
-        Annotation[] bindingAnnots = AnnotationUtil.getBindingAnnotations(annots);
+        Annotation[] bindingAnnots = AnnotationUtil.getQualifierAnnotations(annots);
         injectionPoint = new InjectionPointImpl(owner, type, member, annotated);
 
         addAnnotation(injectionPoint, bindingAnnots, true);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java Fri Sep  4 18:18:41 2009
@@ -31,7 +31,7 @@
 
 class InjectionPointImpl implements InjectionPoint
 {
-    private Set<Annotation> bindingAnnotations = new HashSet<Annotation>();
+    private Set<Annotation> qualifierAnnotations = new HashSet<Annotation>();
     
     private Bean<?> ownerBean;
     
@@ -40,7 +40,7 @@
     private Type injectionType;
     
     private Annotated annotated;
-    
+
     InjectionPointImpl(Bean<?> ownerBean, Type type, Member member, Annotated annotated)
     {
         this.ownerBean = ownerBean;
@@ -49,9 +49,9 @@
         this.annotated = annotated;
     }
     
-    void addBindingAnnotation(Annotation bindingannotation)
+    void addBindingAnnotation(Annotation qualifierAnnotations)
     {
-        this.bindingAnnotations.add(bindingannotation);        
+        this.qualifierAnnotations.add(qualifierAnnotations);
     }
     
     public Bean<?> getBean()
@@ -60,10 +60,10 @@
         return this.ownerBean;
     }
 
-    public Set<Annotation> getBindings()
+    public Set<Annotation> getQualifiers()
     {
         
-        return this.bindingAnnotations;
+        return this.qualifierAnnotations;
     }
 
     public Member getMember()

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -39,15 +39,15 @@
     /** Injected class type */
     private Type injectionClazz;
 
-    /** Binding annotations appeared on the injection point */
-    private Set<Annotation> bindingAnnotations = new HashSet<Annotation>();
+    /** Qualifier annotations appeared on the injection point */
+    private Set<Annotation> qualifierAnnotations = new HashSet<Annotation>();
 
     /**
      * Creates new instance.
      * 
      * @param injectionClazz injection class type
      * @param actualTypeArguments actual type arguments
-     * @param annotations binding annotations
+     * @param annotations qualifier annotations
      */
     InstanceImpl(Type injectionClazz, Annotation... annotations)
     {
@@ -55,14 +55,14 @@
 
         for (Annotation ann : annotations)
         {
-            bindingAnnotations.add(ann);
+            qualifierAnnotations.add(ann);
         }
     }
 
     /**
-     * Returns the bean instance with given binding annotations.
+     * Returns the bean instance with given qualifier annotations.
      * 
-     * @param annotations binding annotations
+     * @param annotations qualifier annotations
      * @return bean instance
      */
     @SuppressWarnings("unchecked")
@@ -70,8 +70,8 @@
     {
         T instance = null;
 
-        Annotation[] anns = new Annotation[this.bindingAnnotations.size()];
-        anns = this.bindingAnnotations.toArray(anns);
+        Annotation[] anns = new Annotation[this.qualifierAnnotations.size()];
+        anns = this.qualifierAnnotations.toArray(anns);
         
         Set<Bean<?>> beans = resolveBeans();
 
@@ -90,8 +90,8 @@
      */
     private Set<Bean<?>> resolveBeans()
     {
-        Annotation[] anns = new Annotation[this.bindingAnnotations.size()];
-        anns = this.bindingAnnotations.toArray(anns);
+        Annotation[] anns = new Annotation[this.qualifierAnnotations.size()];
+        anns = this.qualifierAnnotations.toArray(anns);
 
         InjectionResolver resolver = InjectionResolver.getInstance();
         Set<Bean<?>> beans = resolver.implResolveByType(this.injectionClazz, anns);
@@ -125,51 +125,51 @@
      * {@inheritDoc}
      */
     @Override
-    public Instance<T> select(Annotation... bindings)
+    public Instance<T> select(Annotation... qualifiers)
     {
-        Annotation[] newBindingsArray = getAdditionalBindings(bindings);
-        InstanceImpl<T> newInstance = new InstanceImpl<T>(this.injectionClazz, newBindingsArray);
+        Annotation[] newQualifiersArray = getAdditionalQualifiers(qualifiers);
+        InstanceImpl<T> newInstance = new InstanceImpl<T>(this.injectionClazz, newQualifiersArray);
 
         return newInstance;
     }
 
     /**
-     * Returns total binding types array
+     * Returns total qualifiers array
      * 
-     * @param bindings additional bindings
-     * @return total binding types array
+     * @param qualifiers additional qualifiers
+     * @return total qualifiers array
      */
-    private Annotation[] getAdditionalBindings(Annotation[] bindings)
+    private Annotation[] getAdditionalQualifiers(Annotation[] qualifiers)
     {
-        AnnotationUtil.checkBindingTypeConditions(bindings);
-        Set<Annotation> newBindings = new HashSet<Annotation>(this.bindingAnnotations);
+        AnnotationUtil.checkQualifierConditions(qualifiers);
+        Set<Annotation> newQualifiers = new HashSet<Annotation>(this.qualifierAnnotations);
 
-        if (bindings != null && bindings.length > 0)
+        if (qualifiers != null && qualifiers.length > 0)
         {
-            for (Annotation annot : bindings)
+            for (Annotation annot : qualifiers)
             {
-                if (newBindings.contains(annot))
+                if (newQualifiers.contains(annot))
                 {
-                    throw new IllegalArgumentException("Duplicate Binding Exception, " + this.toString());
+                    throw new IllegalArgumentException("Duplicate Qualifier Exception, " + this.toString());
                 }
 
-                newBindings.add(annot);
+                newQualifiers.add(annot);
             }
         }
 
-        Annotation[] newBindingsArray = new Annotation[newBindings.size()];
-        newBindingsArray = newBindings.toArray(newBindingsArray);
+        Annotation[] newQualifiersArray = new Annotation[newQualifiers.size()];
+        newQualifiersArray = newQualifiers.toArray(newQualifiersArray);
         
-        return newBindingsArray;
+        return newQualifiersArray;
     }
     
     /**
      * {@inheritDoc}
      */
     @Override
-    public <U extends T> Instance<U> select(Class<U> subtype, Annotation... bindings)
+    public <U extends T> Instance<U> select(Class<U> subtype, Annotation... qualifiers)
     {
-        AnnotationUtil.checkBindingTypeConditions(bindings);
+        AnnotationUtil.checkQualifierConditions(qualifiers);
         
         Type sub = subtype;
         
@@ -178,9 +178,9 @@
             sub = this.injectionClazz;
         }
         
-        Annotation[] newBindings = getAdditionalBindings(bindings);
+        Annotation[] newQualifiers = getAdditionalQualifiers(qualifiers);
         
-        InstanceImpl<U> newInstance = new InstanceImpl<U>(sub, newBindings);
+        InstanceImpl<U> newInstance = new InstanceImpl<U>(sub, newQualifiers);
                     
         return newInstance;
     }
@@ -189,9 +189,9 @@
      * {@inheritDoc}
      */
     @Override
-    public <U extends T> Instance<U> select(TypeLiteral<U> subtype, Annotation... bindings)
+    public <U extends T> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers)
     {        
-        return select(subtype.getRawType(), bindings);
+        return select(subtype.getRawType(), qualifiers);
     }
 
     /**
@@ -219,16 +219,16 @@
         builder.append(ClassUtil.getClazz(this.injectionClazz).getName());
         builder.append(">");
 
-        builder.append(",with binding annotations {");
+        builder.append(",with qualifier annotations {");
         int i = 0;
-        for (Annotation binding : this.bindingAnnotations)
+        for (Annotation qualifier : this.qualifierAnnotations)
         {
             if (i != 0)
             {
                 builder.append(",");
             }
 
-            builder.append(binding.toString());
+            builder.append(qualifier.toString());
         }
 
         builder.append("}");

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java Fri Sep  4 18:18:41 2009
@@ -20,7 +20,6 @@
 import javax.annotation.PreDestroy;
 import javax.enterprise.inject.spi.Interceptor;
 import javax.interceptor.AroundInvoke;
-import javax.interceptor.InterceptorBindingType;
 import javax.interceptor.Interceptors;
 
 
@@ -31,7 +30,7 @@
  * <ul>
  * <li>EJB related interceptors with {@link Interceptors} annotation</li>
  * <li>WebBeans specific interceptor definition with using
- * {@link InterceptorBindingType} and {@link Interceptor}</li>
+ * {@link javax.interceptor.InterceptorBinding} and {@link Interceptor}</li>
  * </ul>
  * </p>
  * <p>

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Fri Sep  4 18:18:41 2009
@@ -59,7 +59,7 @@
     public Object invoke(Object instance, Method method, Method proceed, Object[] arguments) throws Exception
     {
         //Context of the bean
-        Context webbeansContext = BeanManagerImpl.getManager().getContext(component.getScopeType());
+        Context webbeansContext = BeanManagerImpl.getManager().getContext(component.getScope());
         
         //Get bean instance from context
         Object webbeansInstance = webbeansContext.get((Contextual<Object>)this.component, (CreationalContext<Object>)this.component.getCreationalContext());

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java Fri Sep  4 18:18:41 2009
@@ -170,7 +170,7 @@
         Asserts.nullCheckForClass(clazz);
         if (!AnnotationUtil.isInterceptorBindingMetaAnnotationExist(clazz.getDeclaredAnnotations()))
         {
-            throw new WebBeansConfigurationException("WebBeans Interceptor class : " + clazz.getName() + " must have at least one @InterceptorBindingType annotation");
+            throw new WebBeansConfigurationException("WebBeans Interceptor class : " + clazz.getName() + " must have at least one @InterceptorBinding annotation");
         }
 
         checkLifecycleConditions(clazz, clazz.getDeclaredAnnotations(), "Lifecycle interceptor : " + clazz.getName() + " interceptor binding type must be defined as @Target{TYPE}");
@@ -224,7 +224,7 @@
         //Simple webbeans 
         if(ClassUtil.isFinal(clazz.getModifiers()) && hasClassInterceptors)
         {
-            throw new WebBeansConfigurationException("Final Simple class with name : " + clazz.getName() + " can not define any InterceptorBinding types");
+            throw new WebBeansConfigurationException("Final Simple class with name : " + clazz.getName() + " can not define any InterceptorBindings");
         }
 
         Method[] methods = clazz.getDeclaredMethods();
@@ -236,13 +236,13 @@
             {
                 if (hasClassInterceptors)
                 {
-                    throw new WebBeansConfigurationException("Simple web bean class : " + clazz.getName() + " can not define non-static, non-private final methods. Because it is annotated with at least one @InterceptorBindintType");
+                    throw new WebBeansConfigurationException("Simple web bean class : " + clazz.getName() + " can not define non-static, non-private final methods. Because it is annotated with at least one @InterceptorBinding");
                 }
                 else
                 {
                     if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(method.getDeclaredAnnotations()))
                     {
-                        throw new WebBeansConfigurationException("Method : " + method.getName() + "in simple web bean class : " + clazz.getName() + " can not be defined as non-static, non-private and final . Because it is annotated with at least one @InterceptorBindintType");
+                        throw new WebBeansConfigurationException("Method : " + method.getName() + "in simple web bean class : " + clazz.getName() + " can not be defined as non-static, non-private and final . Because it is annotated with at least one @InterceptorBinding");
                     }
                 }
             }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java Fri Sep  4 18:18:41 2009
@@ -88,7 +88,7 @@
     @SuppressWarnings("unchecked")
     private void configureTarget(Bean<?> bean)
     {
-        Context webbeansContext = BeanManagerImpl.getManager().getContext(bean.getScopeType());
+        Context webbeansContext = BeanManagerImpl.getManager().getContext(bean.getScope());
         
         this.target = webbeansContext.get((Contextual<Object>)bean, (CreationalContext<Object>)CreationalContextFactory.getInstance().getCreationalContext(bean));        
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java Fri Sep  4 18:18:41 2009
@@ -69,7 +69,7 @@
 
         for (Annotation ann : interceptorBindingTypes)
         {
-            interceptor.addInterceptorBindingType(ann.annotationType(), ann);
+            interceptor.addInterceptorBinding(ann.annotationType(), ann);
         }
 
         logger.info("Configuring the Web Beans Interceptor Class : " + delegate.getReturnType() + " ended");
@@ -117,7 +117,7 @@
             IBeanInheritedMetaData metadata = component.getInheritedMetaData();
             if(metadata != null)
             {
-                Set<Annotation> inheritedBindingTypes = metadata.getInheritedInterceptorBindingTypes();
+                Set<Annotation> inheritedBindingTypes = metadata.getInheritedInterceptorBindings();
                 if(!inheritedBindingTypes.isEmpty())
                 {
                     bindingTypeSet.addAll(inheritedBindingTypes);   
@@ -243,7 +243,7 @@
         {
             interceptor = (WebBeansInterceptor<?>) it.next();
 
-            if (interceptor.isBindingTypesExist(bindingTypes, listAnnot))
+            if (interceptor.isBindingExist(bindingTypes, listAnnot))
             {
                 set.add(interceptor);
                 set.addAll(interceptor.getMetaInceptors());

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -29,7 +29,6 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.InterceptionType;
 import javax.enterprise.inject.spi.Interceptor;
-import javax.interceptor.InterceptorBindingType;
 import javax.interceptor.InvocationContext;
 
 import org.apache.webbeans.component.AbstractBean;
@@ -50,7 +49,7 @@
 /**
  * Defines the webbeans specific interceptors.
  * <p>
- * WebBeans interceotor classes has at least one {@link InterceptorBindingType}
+ * WebBeans interceotor classes has at least one {@link javax.interceptor.InterceptorBinding}
  * annotation. It can be defined on the class or method level at the component.
  * WebBeans interceptors are called after the EJB related interceptors are
  * called in the chain. Semantics of the interceptors are specified by the EJB
@@ -91,12 +90,12 @@
     /**
      * Add new binding type to the interceptor.
      * 
-     * @param bindingType interceptor binding type annot. class
+     * @param binding interceptor binding annotation. class
      * @param annot binding type annotation
      */
-    public void addInterceptorBindingType(Class<? extends Annotation> bindingType, Annotation annot)
+    public void addInterceptorBinding(Class<? extends Annotation> binding, Annotation annot)
     {
-        Method[] methods = bindingType.getDeclaredMethods();
+        Method[] methods = binding.getDeclaredMethods();
 
         for (Method method : methods)
         {
@@ -105,12 +104,12 @@
             {
                 if (!AnnotationUtil.isAnnotationExist(method.getAnnotations(), NonBinding.class))
                 {
-                    throw new WebBeansConfigurationException("Interceptor definition class : " + getClazz().getName() + " @InterceptorBindingType : " + bindingType.getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
+                    throw new WebBeansConfigurationException("Interceptor definition class : " + getClazz().getName() + " @InterceptorBinding : " + binding.getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
                 }
             }
         }
 
-        interceptorBindingSet.put(bindingType, annot);
+        interceptorBindingSet.put(binding, annot);
     }
 
     /**
@@ -121,7 +120,7 @@
      * @param annots binding types annots.
      * @return true if binding types exist ow false
      */
-    public boolean isBindingTypesExist(List<Class<? extends Annotation>> bindingTypes, List<Annotation> annots)
+    public boolean isBindingExist(List<Class<? extends Annotation>> bindingTypes, List<Annotation> annots)
     {
         boolean result = false;
 
@@ -190,7 +189,7 @@
             }
 
             /*
-             * For example: @InterceptorBindingType @Transactional @Action
+             * For example: @InterceptorBinding @Transactional @Action
              * public @interface ActionTransactional @ActionTransactional
              * @Production { }
              */
@@ -228,7 +227,7 @@
     }
 
     @Override
-    public Set<Annotation> getInterceptorBindingTypes()
+    public Set<Annotation> getInterceptorBindings()
     {
         Set<Annotation> set = new HashSet<Annotation>();
         Set<Class<? extends Annotation>> keySet = this.interceptorBindingSet.keySet();
@@ -290,9 +289,9 @@
     }
 
     @Override
-    public Set<Annotation> getBindings()
+    public Set<Annotation> getQualifiers()
     {
-        return delegateComponent.getBindings();
+        return delegateComponent.getQualifiers();
     }
 
     @Override
@@ -308,9 +307,9 @@
     }
 
     @Override
-    public Class<? extends Annotation> getScopeType()
+    public Class<? extends Annotation> getScope()
     {
-        return delegateComponent.getScopeType();
+        return delegateComponent.getScope();
     }
 
     public Set<Type> getTypes()

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java Fri Sep  4 18:18:41 2009
@@ -41,7 +41,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void addBindingType(Class<? extends Annotation> bindingType)
+    public void addQualifier(Class<? extends Annotation> qualifier)
     {
         // TODO Auto-generated method stub
         
@@ -51,7 +51,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void addInterceptorBindingType(Class<? extends Annotation> bindingType, Annotation... bindingTypeDef)
+    public void addInterceptorBinding(Class<? extends Annotation> binding, Annotation... bindingDef)
     {
         // TODO Auto-generated method stub
         
@@ -61,7 +61,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void addScopeType(Class<? extends Annotation> scopeType, boolean normal, boolean passivating)
+    public void addScope(Class<? extends Annotation> scope, boolean normal, boolean passivating)
     {
         // TODO Auto-generated method stub
         

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -31,7 +31,7 @@
 import javax.enterprise.inject.stereotype.Stereotype;
 
 import javax.inject.Qualifier;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
 
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.plugins.OpenWebBeansPlugin;
@@ -277,13 +277,13 @@
     }
 
     /**
-     * Gets the method first found parameter binding types.
+     * Gets the method first found parameter qualifiers.
      * 
      * @param method method
      * @param annotation checking annotation
      * @return annotation array
      */
-    public static Annotation[] getMethodFirstParameterBindingTypesWithGivenAnnotation(Method method, Class<? extends Annotation> clazz)
+    public static Annotation[] getMethodFirstParameterQualifierWithGivenAnnotation(Method method, Class<? extends Annotation> clazz)
     {
         Asserts.assertNotNull(method, "Method argument can not be null");
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
@@ -305,7 +305,7 @@
                     continue;
                 }
 
-                if (AnnotationUtil.isBindingAnnotation(btype))
+                if (AnnotationUtil.isQualifierAnnotation(btype))
                 {
                     list.add(param);
                 }
@@ -492,12 +492,12 @@
     }
 
     /**
-     * Gets the array of binding annotations on the given array.
+     * Gets the array of qualifier annotations on the given array.
      * 
      * @param annotations annotation array
-     * @return array containing binding type anns
+     * @return array containing qualifier anns
      */
-    public static Annotation[] getBindingAnnotations(Annotation... annotations)
+    public static Annotation[] getQualifierAnnotations(Annotation... annotations)
     {
         Asserts.assertNotNull(annotations, "Annotations argument can not be null");
 
@@ -505,7 +505,7 @@
 
         for (Annotation annot : annotations)
         {
-            if (AnnotationUtil.isBindingAnnotation(annot.annotationType()))
+            if (AnnotationUtil.isQualifierAnnotation(annot.annotationType()))
             {
                 set.add(annot);
             }
@@ -712,11 +712,11 @@
         return fields;
     }
 
-    public static void checkBindingTypeConditions(Annotation... bindignTypeAnnots)
+    public static void checkQualifierConditions(Annotation... qualifierAnnots)
     {
         Annotation before = null;
 
-        for (Annotation ann : bindignTypeAnnots)
+        for (Annotation ann : qualifierAnnots)
         {
             Method[] methods = ann.annotationType().getDeclaredMethods();
 
@@ -727,15 +727,15 @@
                 {
                     if (!AnnotationUtil.isAnnotationExist(method.getDeclaredAnnotations(), NonBinding.class))
                     {
-                        throw new WebBeansConfigurationException("@BindingType : " + ann.annotationType().getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
+                        throw new WebBeansConfigurationException("@Qualifier : " + ann.annotationType().getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
                     }
                 }
             }
             
             
-            if (!AnnotationUtil.isBindingAnnotation(ann.annotationType()))
+            if (!AnnotationUtil.isQualifierAnnotation(ann.annotationType()))
             {
-                throw new IllegalArgumentException("Binding annotations must be annotated with @BindingType");
+                throw new IllegalArgumentException("Qualifier annotations must be annotated with @Qualifier");
             }
 
             if (before == null)
@@ -746,7 +746,7 @@
             {
                 if (before.equals(ann))
                 {
-                    throw new IllegalArgumentException("Binding annotations can not contain duplicate binding : @" + before.annotationType().getName());
+                    throw new IllegalArgumentException("Qualifier annotations can not contain duplicate qualifier : @" + before.annotationType().getName());
                 }
                 else
                 {
@@ -758,13 +758,13 @@
 
     /**
      * Returns true if the annotation is defined in xml or annotated with
-     * {@link BindingType} false otherwise.
+     * {@link javax.inject.Qualifier} false otherwise.
      * 
      * @param clazz type of the annotation
      * @return true if the annotation is defined in xml or annotated with
-     *         {@link BindingType} false otherwise
+     *         {@link javax.inject.Qualifier} false otherwise
      */
-    public static boolean isBindingAnnotation(Class<? extends Annotation> clazz)
+    public static boolean isQualifierAnnotation(Class<? extends Annotation> clazz)
     {
         Asserts.assertNotNull(clazz, "clazz parameter can not be null");
         XMLAnnotationTypeManager manager = XMLAnnotationTypeManager.getInstance();
@@ -787,12 +787,12 @@
      * @param bean bean
      * @return true if any binding exist
      */
-    public static boolean isAnyBindingExist(Bean<?> bean)
+    public static boolean isAnyQualifierExist(Bean<?> bean)
     {
     	Asserts.assertNotNull(bean, "bean parameter can not be null");
-    	Set<Annotation> bindings = bean.getBindings();
+    	Set<Annotation> qualifiers = bean.getQualifiers();
     	
-    	for(Annotation ann : bindings)
+    	for(Annotation ann : qualifiers)
     	{
     		if(ann.annotationType().equals(Any.class))
     		{
@@ -840,7 +840,7 @@
      * 
      * @param clazz type of the annotation
      * @return true if the annotation is defined in xml or annotated with
-     *         {@link BindingType} false otherwise
+     *         {@link javax.inject.Qualifier} false otherwise
      */
     public static boolean isResourceAnnotation(Class<? extends Annotation> clazz)
     {
@@ -861,11 +861,11 @@
 
     /**
      * Returns true if the annotation is defined in xml or annotated with
-     * {@link InterceptorBindingType} false otherwise.
+     * {@link javax.interceptor.InterceptorBinding} false otherwise.
      * 
      * @param clazz type of the annotation
      * @return true if the annotation is defined in xml or annotated with
-     *         {@link InterceptorBindingType} false otherwise
+     *         {@link javax.interceptor.InterceptorBinding} false otherwise
      */
     public static boolean isInterceptorBindingAnnotation(Class<? extends Annotation> clazz)
     {
@@ -875,7 +875,7 @@
         {
             return true;
         }
-        else if (clazz.isAnnotationPresent(InterceptorBindingType.class))
+        else if (clazz.isAnnotationPresent(InterceptorBinding.class))
         {
             return true;
         }
@@ -994,12 +994,12 @@
     /**
      * If the bean extends generic class via {@link Realizes}
      * annotation, realized based producer methods, fields and observer
-     * methods binding type is 
+     * methods qualifier is
      * 
      * <ul>
-     *  <li>Binding types on the definitions</li>
-     *  <li>Plus class binding types</li>
-     *  <li>Minus generic class binding types</li>
+     *  <li>Qualifiers on the definitions</li>
+     *  <li>Plus class qualifiers</li>
+     *  <li>Minus generic class qualifiers</li>
      * </ul>
      * 
      * @param clazz realized definition class
@@ -1014,14 +1014,14 @@
             setAnnots.add(definedAnn);
         }
         
-        Annotation[] genericReliazesAnns = AnnotationUtil.getBindingAnnotations(clazz.getSuperclass().getDeclaredAnnotations());
+        Annotation[] genericReliazesAnns = AnnotationUtil.getQualifierAnnotations(clazz.getSuperclass().getDeclaredAnnotations());
         
         for(Annotation generic : genericReliazesAnns)
         {
             setAnnots.remove(generic);
         }
         
-        genericReliazesAnns = AnnotationUtil.getBindingAnnotations(clazz.getDeclaredAnnotations());
+        genericReliazesAnns = AnnotationUtil.getQualifierAnnotations(clazz.getDeclaredAnnotations());
 
         for(Annotation generic : genericReliazesAnns)
         {

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -182,9 +182,9 @@
     	
         if (ClassUtil.isDefinitionConstainsTypeVariables(clazz))
         {
-            if(!bean.getScopeType().equals(Dependent.class))
+            if(!bean.getScope().equals(Dependent.class))
             {
-                throw new WebBeansConfigurationException("Generic type may only defined with scope type @Dependent for bean class : " + clazz.getName());
+                throw new WebBeansConfigurationException("Generic type may only defined with scope @Dependent for bean class : " + clazz.getName());
             }
         }
     }
@@ -218,9 +218,9 @@
     	
     	if(checkGenericForProducers(type, message))
     	{
-            if(!bean.getScopeType().equals(Dependent.class))
+            if(!bean.getScope().equals(Dependent.class))
             {
-                throw new WebBeansConfigurationException(message + " scope type must bee @Dependent");
+                throw new WebBeansConfigurationException(message + " scope must bee @Dependent");
             }
     	}
     }
@@ -343,14 +343,14 @@
                     Annotation btype = param.annotationType().getAnnotation(Disposes.class);
                     if (btype != null)
                     {
-                        throw new WebBeansConfigurationException("Constructor parameter binding type annotation can not be @Disposes annotation in class " + clazz.getName());
+                        throw new WebBeansConfigurationException("Constructor parameter qualifier annotation can not be @Disposes annotation in class " + clazz.getName());
                     }
                     else
                     {
                         btype = param.annotationType().getAnnotation(Observes.class);
                         if (btype != null)
                         {
-                            throw new WebBeansConfigurationException("Constructor parameter binding type annotation can not be @Observes annotation in class " + clazz.getName());
+                            throw new WebBeansConfigurationException("Constructor parameter qualifier annotation can not be @Observes annotation in class " + clazz.getName());
                         }
                     }
                 }
@@ -446,13 +446,13 @@
      * @throws WebBeansConfigurationException if &x0040;New plus any other binding annotation is set or
      *         if &x0040;New is used for an Interface or an abstract class.
      */
-    public static Annotation[] checkForNewBindingForDeployment(Type type, Class<?> clazz, String name, Annotation[] annotations)
+    public static Annotation[] checkForNewQualifierForDeployment(Type type, Class<?> clazz, String name, Annotation[] annotations)
     {
         Asserts.assertNotNull(type, "Type argument can not be null");
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
         Asserts.assertNotNull(annotations, "Annotations argument can not be null");
 
-        Annotation[] as = AnnotationUtil.getBindingAnnotations(annotations);
+        Annotation[] as = AnnotationUtil.getQualifierAnnotations(annotations);
         for (Annotation a : annotations)
         {
             if (a.annotationType().equals(New.class))
@@ -574,7 +574,7 @@
         }
 
         comp.setImplScopeType(new DependentScopeLiteral());
-        comp.addBindingType(new NewLiteral());
+        comp.addQualifier(new NewLiteral());
         comp.setName(null);
         comp.addApiType(clazz);
         comp.addApiType(Object.class);
@@ -600,7 +600,7 @@
         DefinitionUtil.defineApiTypes(comp, clazz);
         
         comp.setImplScopeType(new ApplicationScopeLiteral());
-        comp.addBindingType(new CurrentLiteral());        
+        comp.addQualifier(new CurrentLiteral());
         comp.setType(new ProductionLiteral());
         
         DefinitionUtil.defineObserverMethods(comp, clazz);
@@ -645,7 +645,7 @@
         
         
         comp.setImplScopeType(new DependentScopeLiteral());
-        comp.addBindingType(new NewLiteral());
+        comp.addQualifier(new NewLiteral());
         comp.setType(new StandardLiteral());
         comp.setName(null);
         
@@ -671,7 +671,7 @@
         EventBean<T> component = new EventBean<T>(returnType, eventType, WebBeansType.OBSERVABLE);
 
         DefinitionUtil.defineApiTypes(component, returnType);
-        DefinitionUtil.defineBindingTypes(component, annotations);
+        DefinitionUtil.defineQualifiers(component, annotations);
 
         component.setType(new StandardLiteral());
         component.setImplScopeType(new DependentScopeLiteral());                      
@@ -689,7 +689,7 @@
 
         managerComponent.setImplScopeType(new DependentScopeLiteral());
         managerComponent.setType(new StandardLiteral());
-        managerComponent.addBindingType(new CurrentLiteral());
+        managerComponent.addQualifier(new CurrentLiteral());
         managerComponent.addApiType(BeanManager.class);
         managerComponent.addApiType(Object.class);
 
@@ -712,7 +712,7 @@
         instanceComponent.addApiType(clazz);
         instanceComponent.addApiType(Object.class);
         
-        DefinitionUtil.defineBindingTypes(instanceComponent, obtainsBindings);
+        DefinitionUtil.defineQualifiers(instanceComponent, obtainsBindings);
         instanceComponent.setImplScopeType(new DependentScopeLiteral());
         instanceComponent.setType(new StandardLiteral());
         instanceComponent.setName(null);
@@ -734,7 +734,7 @@
         conversationComp.addApiType(Object.class);
         conversationComp.setImplScopeType(new RequestedScopeLiteral());
         conversationComp.setType(new StandardLiteral());
-        conversationComp.addBindingType(new CurrentLiteral());
+        conversationComp.addQualifier(new CurrentLiteral());
         conversationComp.setName("javax.context.conversation");
 
         return conversationComp;
@@ -1278,9 +1278,9 @@
                     throw new WebBeansConfigurationException("@StereoType annotation can not define @Named annotation with value");
                 }
             }
-            else if (AnnotationUtil.isBindingAnnotation(annotType))
+            else if (AnnotationUtil.isQualifierAnnotation(annotType))
             {
-                throw new WebBeansConfigurationException("@StereoType annotation can not define @BindingType annotation");
+                throw new WebBeansConfigurationException("@StereoType annotation can not define @Qualifier annotation");
             }
             else if (AnnotationUtil.isInterceptorBindingAnnotation(annotType))
             {
@@ -1289,7 +1289,7 @@
 
                 if (type.length != 1 && !type[0].equals(ElementType.TYPE))
                 {
-                    throw new WebBeansConfigurationException("Stereotype with @InterceptorBindingType must be defined as @Target{TYPE}");
+                    throw new WebBeansConfigurationException("Stereotype with @InterceptorBinding must be defined as @Target{TYPE}");
                 }
 
             }
@@ -1371,7 +1371,7 @@
                     comp.setSpecializedBean(true);
                 }
                                 
-                specialized.getBindings().addAll(superBean.getBindings());
+                specialized.getQualifiers().addAll(superBean.getQualifiers());
             }
             
             else
@@ -1497,11 +1497,11 @@
             throw new WebBeansConfigurationException("Producer method specialization is failed. Method " + method.getName() + " found in super class : " + superClass.getName() + " is not annotated with @Produces");
         }
 
-        Annotation[] anns = AnnotationUtil.getBindingAnnotations(superMethod.getAnnotations());
+        Annotation[] anns = AnnotationUtil.getQualifierAnnotations(superMethod.getAnnotations());
 
         for (Annotation ann : anns)
         {
-            component.addBindingType(ann);
+            component.addQualifier(ann);
         }
         
         configuredProducerSpecializedName(component, method, superMethod);
@@ -1582,38 +1582,38 @@
 
     }
 
-    public static void checkInterceptorResolverParams(Annotation... interceptorBindingTypes)
+    public static void checkInterceptorResolverParams(Annotation... interceptorBindings)
     {
-        if (interceptorBindingTypes == null || interceptorBindingTypes.length == 0)
+        if (interceptorBindings == null || interceptorBindings.length == 0)
         {
-            throw new IllegalArgumentException("Manager.resolveInterceptors() method parameter interceptor binding types array argument can not be empty");
+            throw new IllegalArgumentException("Manager.resolveInterceptors() method parameter interceptor bindings array argument can not be empty");
         }
 
         Annotation old = null;
-        for (Annotation interceptorBindingType : interceptorBindingTypes)
+        for (Annotation interceptorBinding : interceptorBindings)
         {
             if (old == null)
             {
-                old = interceptorBindingType;
+                old = interceptorBinding;
             }
             else
             {
-                if (old.equals(interceptorBindingType))
+                if (old.equals(interceptorBinding))
                 {
-                    throw new IllegalArgumentException("Manager.resolveInterceptors() method parameter interceptor binding types array argument can not define duplicate binding annotation with name : @" + old.getClass().getName());
+                    throw new IllegalArgumentException("Manager.resolveInterceptors() method parameter interceptor bindings array argument can not define duplicate binding annotation with name : @" + old.getClass().getName());
                 }
 
-                if (!AnnotationUtil.isInterceptorBindingAnnotation(interceptorBindingType.annotationType()))
+                if (!AnnotationUtil.isInterceptorBindingAnnotation(interceptorBinding.annotationType()))
                 {
-                    throw new IllegalArgumentException("Manager.resolveInterceptors() method parameter interceptor binding types array can not contain other annotation that is not @InterceptorBindingType");
+                    throw new IllegalArgumentException("Manager.resolveInterceptors() method parameter interceptor bindings array can not contain other annotation that is not @InterceptorBinding");
                 }
 
-                old = interceptorBindingType;
+                old = interceptorBinding;
             }
         }
     }
 
-    public static void checkDecoratorResolverParams(Set<Type> apiTypes, Annotation... bindingTypes)
+    public static void checkDecoratorResolverParams(Set<Type> apiTypes, Annotation... qualifiers)
     {
         if (apiTypes == null || apiTypes.size() == 0)
         {
@@ -1621,25 +1621,25 @@
         }
 
         Annotation old = null;
-        for (Annotation bindingType : bindingTypes)
+        for (Annotation qualifier : qualifiers)
         {
             if (old == null)
             {
-                old = bindingType;
+                old = qualifier;
             }
             else
             {
-                if (old.annotationType().equals(bindingType.annotationType()))
+                if (old.annotationType().equals(qualifier.annotationType()))
                 {
-                    throw new IllegalArgumentException("Manager.resolveDecorators() method parameter binding types array argument can not define duplicate binding annotation with name : @" + old.annotationType().getName());
+                    throw new IllegalArgumentException("Manager.resolveDecorators() method parameter qualifiers array argument can not define duplicate qualifier annotation with name : @" + old.annotationType().getName());
                 }
 
-                if (!AnnotationUtil.isBindingAnnotation(bindingType.annotationType()))
+                if (!AnnotationUtil.isQualifierAnnotation(qualifier.annotationType()))
                 {
-                    throw new IllegalArgumentException("Manager.resolveDecorators() method parameter binding types array can not contain other annotation that is not @BindingType");
+                    throw new IllegalArgumentException("Manager.resolveDecorators() method parameter qualifiers array can not contain other annotation that is not @Qualifier");
                 }
 
-                old = bindingType;
+                old = qualifier;
             }
         }
 
@@ -1864,10 +1864,10 @@
         
         clazz = (Class<?>)args[0];
         
-        Annotation[] bindings = new Annotation[injectionPoint.getBindings().size()];
-        bindings = injectionPoint.getBindings().toArray(bindings);
+        Annotation[] qualifiers = new Annotation[injectionPoint.getQualifiers().size()];
+        qualifiers = injectionPoint.getQualifiers().toArray(qualifiers);
         
-        Bean<?> bean = createObservableImplicitComponent(EventImpl.class, clazz, bindings);
+        Bean<?> bean = createObservableImplicitComponent(EventImpl.class, clazz, qualifiers);
         BeanManagerImpl.getManager().addBean(bean);                  
     }
     
@@ -1878,17 +1878,17 @@
         
         Class<Instance<T>> clazz = (Class<Instance<T>>)genericType.getRawType();
         
-        Annotation[] bindings = new Annotation[injectionPoint.getBindings().size()];
-        bindings = injectionPoint.getBindings().toArray(bindings);
+        Annotation[] qualifiers = new Annotation[injectionPoint.getQualifiers().size()];
+        qualifiers = injectionPoint.getQualifiers().toArray(qualifiers);
         
-        Bean<Instance<T>> bean = createInstanceComponent(genericType,clazz, genericType.getActualTypeArguments()[0], bindings);
+        Bean<Instance<T>> bean = createInstanceComponent(genericType,clazz, genericType.getActualTypeArguments()[0], qualifiers);
         BeanManagerImpl.getManager().addBean(bean);
         
     }
     
     public static Bean<?> getMostSpecializedBean(BeanManager manager, Bean<?> component)
     {
-        Set<Bean<?>> beans = manager.getBeans(component.getBeanClass(), AnnotationUtil.getAnnotationsFromSet(component.getBindings()));
+        Set<Bean<?>> beans = manager.getBeans(component.getBeanClass(), AnnotationUtil.getAnnotationsFromSet(component.getQualifiers()));
                 
         for(Bean<?> bean : beans)
         {
@@ -2028,4 +2028,4 @@
         
         return false;
     }
- }
\ No newline at end of file
+}
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Fri Sep  4 18:18:41 2009
@@ -1650,7 +1650,7 @@
         if (scopeType == null)
         { 
             // From stereotype
-            DefinitionUtil.defineDefaultScopeType(component, createConfigurationFailedMessage() + "@ScopeType annotation is not configured correctly");
+            DefinitionUtil.defineDefaultScopeType(component, createConfigurationFailedMessage() + "@Scope annotation is not configured correctly");
         }
         else
         {
@@ -1671,7 +1671,7 @@
 
         if (!isDefined)
         {
-            component.addBindingType(new CurrentLiteral());
+            component.addQualifier(new CurrentLiteral());
         }
 
     }
@@ -1802,7 +1802,7 @@
             {
                 Class<? extends Annotation> binding = (Class<Annotation>)XMLUtil.getElementJavaType(child);
                 
-                if(AnnotationUtil.isBindingAnnotation(binding))
+                if(AnnotationUtil.isQualifierAnnotation(binding))
                 {
                     bindingTypes.add(JavassistProxyFactory.createNewAnnotationProxy(binding));                
                 }                

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -128,7 +128,7 @@
                 if (clazz.isAnnotationPresent(DeploymentType.class) 
                         || clazz.isAnnotationPresent(NormalScope.class) 
                         || clazz.isAnnotationPresent(Scope.class)
-                        || AnnotationUtil.isBindingAnnotation(clazz) 
+                        || AnnotationUtil.isQualifierAnnotation(clazz)
                         || AnnotationUtil.isInterceptorBindingAnnotation(clazz) 
                         || AnnotationUtil.isStereoTypeAnnotation(clazz) 
                         || clazz.equals(Named.class) 
@@ -192,7 +192,7 @@
         while (it.hasNext())
         {
             Class<? extends Annotation> temp = it.next();
-            if (AnnotationUtil.isBindingAnnotation(temp))
+            if (AnnotationUtil.isQualifierAnnotation(temp))
             {
                 Method[] methods = temp.getDeclaredMethods();
 
@@ -203,7 +203,7 @@
                     {
                         if (!AnnotationUtil.isAnnotationExist(method.getAnnotations(), NonBinding.class))
                         {
-                            throw new WebBeansConfigurationException(errorMessage + "WebBeans definition class : " + component.getReturnType().getName() + " @BindingType : " + temp.getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
+                            throw new WebBeansConfigurationException(errorMessage + "WebBeans definition class : " + component.getReturnType().getName() + " @Qualifier : " + temp.getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
                         }
                     }
                 }
@@ -213,7 +213,7 @@
                     found = true;
                 }
 
-                component.addBindingType(XMLUtil.getXMLDefinedAnnotationMember(annotationElementList.get(i), temp, errorMessage));
+                component.addQualifier(XMLUtil.getXMLDefinedAnnotationMember(annotationElementList.get(i), temp, errorMessage));
             }
 
             i++;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java Fri Sep  4 18:18:41 2009
@@ -624,9 +624,9 @@
                 else if (((Class) actualType).isAnnotation())
                 {
                     Class<? extends Annotation> annotClazz = (Class<? extends Annotation>) actualType;
-                    if (!AnnotationUtil.isBindingAnnotation(annotClazz))
+                    if (!AnnotationUtil.isQualifierAnnotation(annotClazz))
                     {
-                        throw new WebBeansConfigurationException(errorMessage + "Java type with name : " + getElementJavaClassName(typeElement) + " is not a @BindingType");
+                        throw new WebBeansConfigurationException(errorMessage + "Java type with name : " + getElementJavaClassName(typeElement) + " is not a @Qualifier");
                     }
 
                     if (definedBindingType == null)
@@ -952,12 +952,12 @@
 
         if (anns.size() == 0)
         {
-            component.addBindingType(new CurrentLiteral());
+            component.addQualifier(new CurrentLiteral());
         }
 
         for (Annotation ann : anns)
         {
-            component.addBindingType(ann);
+            component.addQualifier(ann);
         }
 
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding1.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding1.java Fri Sep  4 18:18:41 2009
@@ -22,9 +22,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
 
-@InterceptorBindingType
+@InterceptorBinding
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target( { ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER })

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding2.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding2.java Fri Sep  4 18:18:41 2009
@@ -22,9 +22,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
 
-@InterceptorBindingType
+@InterceptorBinding
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target( { ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER })



Mime
View raw message