openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r811507 [1/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
Author: gerdogdu
Date: Fri Sep  4 18:18:41 2009
New Revision: 811507

URL: http://svn.apache.org/viewvc?rev=811507&view=rev
Log:
[OWB-134] Remaining 299 draft spec API changes, Thanks to David Blevins

Added:
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Reception.java
      - copied, changed from r811501, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Notify.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBinding.java
      - copied, changed from r811501, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java
Removed:
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Notify.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java
Modified:
    incubator/openwebbeans/trunk/pom.xml
    incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Any.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
    incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/component/creation/EjbBeanCreatorImpl.java
    incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/proxy/EjbBeanProxyHandler.java
    incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java
    incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbValidator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.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/ManagedBeanConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverWrapper.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhIntBinding2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Action.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Transactional.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java
    incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java

Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Fri Sep  4 18:18:41 2009
@@ -503,7 +503,7 @@
     </distributionManagement>
       
 	<properties>
-          <openwebbeans.version>1.0.0-incubating-M3</openwebbeans.version>
+          <openwebbeans.version>1.0.0-incubating-SNAPSHOT</openwebbeans.version>
 	  <siteId>/OWB/1.0.0-incubating-M3-rc1/plugins</siteId>
 	</properties>
 

Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java Fri Sep  4 18:18:41 2009
@@ -21,9 +21,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
 
-@InterceptorBindingType
+@InterceptorBinding
 @Retention(RetentionPolicy.RUNTIME)
 @Target( { ElementType.TYPE, ElementType.METHOD })
 public @interface Transactional

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/spi/Context.java Fri Sep  4 18:18:41 2009
@@ -46,7 +46,7 @@
      * 
      * @return the scope type of the context
      */
-    public Class<? extends Annotation> getScopeType();
+    public Class<? extends Annotation> getScope();
 
     /**
      * If the context is not active, throws {@link ContextNotActiveException}.

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Event.java Fri Sep  4 18:18:41 2009
@@ -22,10 +22,10 @@
 
     public void fire(T event);
     
-    public Event<T> select(Annotation... bindings);
+    public Event<T> select(Annotation... qualifiers);
     
-    public <U extends T> Event<U> select(Class<U> subtype, Annotation... bindings);
+    public <U extends T> Event<U> select(Class<U> subtype, Annotation... qualifiers);
     
-    public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... bindings);
+    public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Observes.java Fri Sep  4 18:18:41 2009
@@ -32,7 +32,7 @@
 public @interface Observes
 {
     /**Specifies whether or not call observer according to owner bean instace*/
-    public Notify notifyObserver() default Notify.ALWAYS;
+    public Reception notifyObserver() default Reception.ALWAYS;
     
     /**Transaction phase*/
     public TransactionPhase during() default TransactionPhase.IN_PROGRESS;

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Reception.java (from r811501, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Notify.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Reception.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Reception.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Notify.java&r1=811501&r2=811507&rev=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Notify.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/event/Reception.java Fri Sep  4 18:18:41 2009
@@ -19,7 +19,7 @@
  * @version $Rev$ $Date$
  *
  */
-public enum Notify
+public enum Reception
 {
     /**Notify observer if owner bean exist*/
     IF_EXISTS,

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Any.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Any.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Any.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Any.java Fri Sep  4 18:18:41 2009
@@ -26,7 +26,7 @@
 import javax.inject.Qualifier;
 
 /**
- * Defines any binding type in the injection point.
+ * Defines any qualifier in the injection point.
  *
  * @version $Rev$ $Date$
  */

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java Fri Sep  4 18:18:41 2009
@@ -17,7 +17,7 @@
 
 /**
  * The <code>Instance</code> interface provides a method for obtaining 
- * instances of beans with required types and bindings.
+ * instances of beans with required types and qualifiers.
  * 
  * @version $Rev$ $Date$
  *
@@ -27,41 +27,41 @@
 {
     /**
      * Returns bean instance with required type 
-     * and required binding type that are defined
+     * and required qualifier that are defined
      * at the injection point.
      * 
-     * @return bean instance with required type and required binding type
+     * @return bean instance with required type and required qualifier
      */
     public T get();
     
     /**
      * Creates new <code>Instance</code> with given
-     * binding annotations. 
+     * qualifiers. 
      * 
-     * @param bindings
-     * @return new child instance with given binding types.
+     * @param qualifiers
+     * @return new child instance with given qualifiers.
      */
-    public Instance<T> select(Annotation... bindings);
+    public Instance<T> select(Annotation... qualifiers);
     
     /**
-     * Returns new child instance with given class and binding types.
+     * Returns new child instance with given class and qualifiers.
      * 
      * @param <U> subtype info
      * @param subtype subtype class
-     * @param bindings binding types
-     * @return new child instance with given class and binding types
+     * @param qualifiers qualifiers
+     * @return new child instance with given class and qualifiers
      */
-    public <U extends T> Instance<U> select(Class<U> subtype, Annotation... bindings);
+    public <U extends T> Instance<U> select(Class<U> subtype, Annotation... qualifiers);
     
     /**
-     * Return new child instance with given class info and binding types.
+     * Return new child instance with given class info and qualifiers.
      * 
      * @param <U> subtype info
      * @param subtype subtype class
-     * @param bindings binding types
-     * @return new child instance with given class info and binding types
+     * @param qualifiers qualifiers
+     * @return new child instance with given class info and qualifiers
      */
-    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 true if resulotion is unsatisfied, false otherwise.

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/NonBinding.java Fri Sep  4 18:18:41 2009
@@ -21,21 +21,21 @@
 import java.lang.annotation.Target;
 
 /**
- * Indicates that <code>BindingType</code> annotation member
+ * Indicates that <code>Qualifier</code> annotation member
  * is not contained in the type safe resolution algorithm.
  * 
  * <p>
  * Example:
  * 
  * <pre>
- * @BindingType
+ * @Qualifier
  * public @interface Mock {
  *   @NonBinding String name;
  * }
  * </pre>
  * 
- * <b>Mock</b> binding type <i>name</i> member variable is excepted from the
- * type safe resolution algorithm while comparing the binding types.
+ * <b>Mock</b> qualifier <i>name</i> member variable is excepted from the
+ * type safe resolution algorithm while comparing the qualifiers.
  * 
  * </p>
  */

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Bean.java Fri Sep  4 18:18:41 2009
@@ -38,11 +38,11 @@
     public abstract Set<Type> getTypes();
 
     /**
-     * Returns binding types of a bean.
+     * Returns qualifiers of a bean.
      * 
-     * @return binding types of a bean
+     * @return qualifiers of a bean
      */
-    public abstract Set<Annotation> getBindings();
+    public abstract Set<Annotation> getQualifiers();
 
 
     /**
@@ -54,11 +54,11 @@
     
     
     /**
-     * Returns scope types of a bean.
+     * Returns scope of a bean.
      * 
-     * @return scope type
+     * @return scope
      */
-    public abstract Class<? extends Annotation> getScopeType();
+    public abstract Class<? extends Annotation> getScope();
 
     /**
      * Returns name of a bean.

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeanManager.java Fri Sep  4 18:18:41 2009
@@ -85,20 +85,20 @@
     
     /**
      * Returns set of beans that their api types contain
-     * given bean type and given bindings.
+     * given bean type and given qualifiers.
      * 
      * <p>
-     * If no binding is given, <code>@Current</code> is assumed.
+     * If no qualifier is given, <code>@Current</code> is assumed.
      * </p>
      * 
      * @param beanType required bean type
-     * @param bindings required binding types
+     * @param qualifiers required qualifiers
      * @return set of beans
      * @throws IllegalArgumentException given bean type is a {@link TypeVariable}
-     * @throws IllegalArgumentException given binding annotation is not a binding type
-     * @throws IllegalArgumentException same binding type is given
+     * @throws IllegalArgumentException given qualifier annotation is not a qualifier
+     * @throws IllegalArgumentException same qualifier is given
      */
-    public Set<Bean<?>> getBeans(Type beanType, Annotation... bindings);
+    public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);
         
     /**
      * Returns set of beans with given name.
@@ -136,50 +136,50 @@
     public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);
         
     /**
-     * Fires an event with given even object and bindings.
+     * Fires an event with given even object and qualifiers.
      * 
      * @param event observer event object
-     * @param bindings event bindings
+     * @param qualifiers event qualifiers
      * @throws IllegalArgumentException event object contains a {@link TypeVariable}
-     * @throws IllegalArgumentException given binding annotation is not a binding type
-     * @throws IllegalArgumentException same binding type is given
+     * @throws IllegalArgumentException given qualifier annotation is not a qualifier
+     * @throws IllegalArgumentException same qualifier is given
      */
-    public void fireEvent(Object event, Annotation... bindings);
+    public void fireEvent(Object event, Annotation... qualifiers);
     
     /**
-     * Returns a set of observers that observe for given event type and bindings
+     * Returns a set of observers that observe for given event type and qualifiers
      * 
      * @param <T> observer type info
      * @param event observer event type
-     * @param bindings event bindings
-     * @return set of observers that observe for given event type and bindings
+     * @param qualifiers event qualifiers
+     * @return set of observers that observe for given event type and qualifiers
      * @throws IllegalArgumentException event object contains a {@link TypeVariable}
-     * @throws IllegalArgumentException given binding annotation is not a binding type
-     * @throws IllegalArgumentException same binding type is given 
+     * @throws IllegalArgumentException given qualifier annotation is not a qualifier
+     * @throws IllegalArgumentException same qualifier is given
      */
-    public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings);
+    public <T> Set<Observer<T>> resolveObservers(T event, Annotation... qualifiers);
     
     /**
      * Returns set of observer methods.
      * 
      * @param <T> event type
      * @param event even object
-     * @param bindings event bindings
+     * @param qualifiers event qualifiers
      * @return set of observer methods
      */
-    public <T> Set<ObserverMethod<?,T>> resolveObserverMethods(T event, Annotation... bindings);
+    public <T> Set<ObserverMethod<?,T>> resolveObserverMethods(T event, Annotation... qualifiers);
     
     /**
      * Returns a list of decorator.
      * 
      * @param types bean types of the decorated bean
-     * @param bindings decorated bean bindings
+     * @param qualifiers decorated bean qualifiers
      * @return list of decorator
-     * @throws IllegalArgumentException given binding annotation is not a binding type
-     * @throws IllegalArgumentException same binding type is given
+     * @throws IllegalArgumentException given qualifier annotation is not a qualifier
+     * @throws IllegalArgumentException same qualifier is given
      * @throws IllegalArgumentException if types is empty set
      */
-    List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindings);
+    List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... qualifiers);
     
     /**
      * Returns a list of interceptor.
@@ -187,9 +187,9 @@
      * @param type interception type
      * @param interceptorBindings interceptor bindings
      * @return list of interceptor
-     * @throws IllegalArgumentException given binding annotation is not a binding type
-     * @throws IllegalArgumentException same binding type is given
-     * @throws IllegalArgumentException binding is not an interceptor binding type
+     * @throws IllegalArgumentException given binding annotation is not a binding
+     * @throws IllegalArgumentException same binding is given
+     * @throws IllegalArgumentException binding is not an interceptor binding
      */
     List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings);
     
@@ -227,20 +227,20 @@
     
 
     /**
-     * Returns true if given type is a binding type, false otherwise.
+     * Returns true if given type is a qualifier, false otherwise.
      * 
      * @param annotationType annotation type
-     * @return true if given type is a binding type, false otherwise
+     * @return true if given type is a qualifier, false otherwise
      */    
     public boolean isQualifier(Class<? extends Annotation> annotationType);
     
     /**
-     * Returns true if given type is a interceptor binding type, false otherwise.
+     * Returns true if given type is a interceptor binding, false otherwise.
      * 
      * @param annotationType annotation type
-     * @return true if given type is a interceptor binding type, false otherwise
+     * @return true if given type is a interceptor binding, false otherwise
      */        
-    public boolean isInterceptorBindingType(Class<? extends Annotation> annotationType);
+    public boolean isInterceptorBinding(Class<? extends Annotation> annotationType);
     
         
     /**
@@ -252,12 +252,12 @@
     public boolean isStereotype(Class<? extends Annotation> annotationType);
         
     /**
-     * Returns a set of meta-annotations that are defined on the binding type
+     * Returns a set of meta-annotations that are defined on the binding
      * 
-     * @param bindingType binding type class
-     * @return a set of meta-annotations that are defined on the binding type
+     * @param qualifier binding class
+     * @return a set of meta-annotations that are defined on the binding
      */
-    public Set<Annotation> getInterceptorBindingTypeDefinition(Class<? extends Annotation> bindingType);
+    public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> qualifier);
     
     /**
      * Returns a set of meta-annotations that are defined on the stereotype type.
@@ -270,10 +270,10 @@
     /**
      * Returns a context with given scope type.
      * 
-     * @param scopeType scope type class type
+     * @param scope scope type class type
      * @return a context with given scope type
      */
-    public Context getContext(Class<? extends Annotation> scopeType);
+    public Context getContext(Class<? extends Annotation> scope);
     
     /**
      * Returns el resolver.

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java Fri Sep  4 18:18:41 2009
@@ -25,20 +25,20 @@
 public interface BeforeBeanDiscovery
 {
     /**
-     * Declares a new binding type.
+     * Declares a new qualifier.
      * 
-     * @param bindingType binding type
+     * @param qualifier qualifier
      */
-    public void addBindingType(Class<? extends Annotation> bindingType);
+    public void addQualifier(Class<? extends Annotation> qualifier);
     
     /**
-     * Declares a new scope type.
+     * Declares a new scope.
      * 
-     * @param scopeType scope type
+     * @param scope scope
      * @param normal is normal or not
      * @param passivating passivated or not
      */
-    public void addScopeType(Class<? extends Annotation> scopeType, boolean normal, boolean passivating);
+    public void addScope(Class<? extends Annotation> scope, boolean normal, boolean passivating);
     
     /**
      * Declares a new stereotype.
@@ -49,12 +49,12 @@
     public void addStereotype(Class<? extends Annotation> stereotype, Annotation... stereotypeDef);
     
     /**
-     * Declares a new binding type.
+     * Declares a new interceptor binding.
      * 
-     * @param bindingType binding type class
-     * @param bindingTypeDef meta annotations
+     * @param binding binding class
+     * @param bindingDef meta annotations
      */
-    public void addInterceptorBindingType(Class<? extends Annotation> bindingType, Annotation... bindingTypeDef);
+    public void addInterceptorBinding(Class<? extends Annotation> binding, Annotation... bindingDef);
     
     /**
      * Adds new annotated type.

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Decorator.java Fri Sep  4 18:18:41 2009
@@ -24,6 +24,6 @@
     
     public abstract Type getDelegateType();
 
-    public abstract Set<Annotation> getDelegateBindingTypes();
+    public abstract Set<Annotation> getDelegateBindings();
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java Fri Sep  4 18:18:41 2009
@@ -45,11 +45,11 @@
     public Type getType();
 
     /**
-     * Returns required binding types of the injection point.
+     * Returns required qualifiers of the injection point.
      * 
-     * @return bindings at the injection point
+     * @return qualifiers at the injection point
      */
-    public Set<Annotation> getBindings();
+    public Set<Annotation> getQualifiers();
 
     /**
      * Returns the injection point owner bean.

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/Interceptor.java Fri Sep  4 18:18:41 2009
@@ -21,7 +21,7 @@
 
 public interface Interceptor<T> extends Bean<T>
 {
-    public abstract Set<Annotation> getInterceptorBindingTypes();
+    public abstract Set<Annotation> getInterceptorBindings();
     
     public boolean intercepts(InterceptionType type);
 

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java Fri Sep  4 18:18:41 2009
@@ -17,7 +17,7 @@
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.enterprise.event.Notify;
+import javax.enterprise.event.Reception;
 import javax.enterprise.event.TransactionPhase;
 
 public interface ObserverMethod<X,T>
@@ -26,9 +26,9 @@
     
     public Type getObservedType();
     
-    public Set<Annotation> getObservedBindings();
+    public Set<Annotation> getObservedQualifiers();
     
-    public Notify getNotify();
+    public Reception getReception();
     
     public TransactionPhase getTransactionPhase();
 

Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBinding.java (from r811501, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBinding.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBinding.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java&r1=811501&r2=811507&rev=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBindingType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/interceptor/InterceptorBinding.java Fri Sep  4 18:18:41 2009
@@ -28,7 +28,7 @@
 @Target(ANNOTATION_TYPE)
 @Retention(RUNTIME)
 @Documented
-public @interface InterceptorBindingType
+public @interface InterceptorBinding
 {
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/component/creation/EjbBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/component/creation/EjbBeanCreatorImpl.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/component/creation/EjbBeanCreatorImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/component/creation/EjbBeanCreatorImpl.java Fri Sep  4 18:18:41 2009
@@ -66,7 +66,7 @@
         }
         
         EjbValidator.validateEjbScopeType(getBean());
-        EjbValidator.validateGenericBeanType(getBean().getReturnType(), getBean().getScopeType());
+        EjbValidator.validateGenericBeanType(getBean().getReturnType(), getBean().getScope());
     }
     
     

Modified: incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/proxy/EjbBeanProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/proxy/EjbBeanProxyHandler.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/proxy/EjbBeanProxyHandler.java (original)
+++ incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/proxy/EjbBeanProxyHandler.java Fri Sep  4 18:18:41 2009
@@ -69,7 +69,7 @@
         OpenWebBeansEjbInterceptor.setThreadLocal(this.ejbBean);
         
         //Context of the bean
-        Context webbeansContext = BeanManagerImpl.getManager().getContext(ejbBean.getScopeType());
+        Context webbeansContext = BeanManagerImpl.getManager().getContext(ejbBean.getScope());
         
         //Get bean instance from context
         Object webbeansInstance = webbeansContext.get((Contextual<Object>)this.ejbBean, (CreationalContext<Object>)this.ejbBean.getCreationalContext());
@@ -91,7 +91,7 @@
         List<Method> removeMethods = this.ejbBean.getDeploymentInfo().getRemoveMethods();
         if(removeMethods.contains(method))
         {
-            if(this.ejbBean.getScopeType() != Dependent.class)
+            if(this.ejbBean.getScope() != Dependent.class)
             {
                 throw new UnsupportedOperationException("Can not call EJB Statefull Bean Remove Method without scoped @Dependent");
             }

Modified: incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java (original)
+++ incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java Fri Sep  4 18:18:41 2009
@@ -80,7 +80,7 @@
         Class<? extends Annotation> deploymentType = ejbBeanCreator.defineDeploymentType("There are more than one @DeploymentType annotation in Session Bean implementation class : " + ejbBean.getReturnType().getName());
         ejbBeanCreator.defineApiType();
         ejbBeanCreator.defineScopeType("Session Bean implementation class : " + clazz.getName() + " stereotypes must declare same @ScopeType annotations");
-        ejbBeanCreator.defineBindingType();
+        ejbBeanCreator.defineQualifier();
         ejbBeanCreator.defineName(WebBeansUtil.getSimpleWebBeanDefaultName(clazz.getSimpleName()));            
         Set<ProducerMethodBean<?>> producerMethodBeans = ejbBeanCreator.defineProducerMethods();        
         checkProducerMethods(producerMethodBeans, ejbBean);

Modified: incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbValidator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbValidator.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbValidator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbValidator.java Fri Sep  4 18:18:41 2009
@@ -42,7 +42,7 @@
     }
 
     /**
-     * Validates session bean's scope types.
+     * Validates session bean's scope.
      * 
      * @param ejbBean ejb bean
      */
@@ -50,9 +50,9 @@
     {
         Asserts.assertNotNull(ejbBean, "Session Bean can not be null");
 
-        if (ejbBean.getScopeType() == null)
+        if (ejbBean.getScope() == null)
         {
-            throw new NullPointerException("Session Bean scope type can not be null");
+            throw new NullPointerException("Session Bean scope can not be null");
         }
 
         if (ejbBean.getEjbType() == null)
@@ -62,14 +62,14 @@
 
         if (ejbBean.getEjbType().equals(SessionBeanType.STATELESS))
         {
-            if (!ejbBean.getScopeType().equals(Dependent.class))
+            if (!ejbBean.getScope().equals(Dependent.class))
             {
                 throw new WebBeansConfigurationException("Stateless Session Bean class : " + ejbBean.getReturnType() + " " + "can not define scope other than @Dependent");
             }
         }
         else if (ejbBean.getEjbType().equals(SessionBeanType.SINGLETON))
         {
-            if (!(ejbBean.getScopeType().equals(Dependent.class) || ejbBean.getScopeType().equals(ApplicationScoped.class)))
+            if (!(ejbBean.getScope().equals(Dependent.class) || ejbBean.getScope().equals(ApplicationScoped.class)))
             {
                 throw new WebBeansConfigurationException("Singleton Session Bean class : " + ejbBean.getReturnType() + " " + "can not define scope other than @Dependent or @ApplicationScoped");
             }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java Fri Sep  4 18:18:41 2009
@@ -60,8 +60,8 @@
     /** Scope type of the bean */
     protected Annotation implScopeType;
 
-    /** Binding types of the bean */
-    protected Set<Annotation> implBindingTypes = new HashSet<Annotation>();
+    /** Qualifiers of the bean */
+    protected Set<Annotation> implQualifiers = new HashSet<Annotation>();
 
     /** Api types of the bean */
     protected Set<Type> apiTypes = new HashSet<Type>();
@@ -304,18 +304,8 @@
     }
 
     /**
-     * Add new binding type.
-     * 
-     * @param bindingType new binding type
-     */
-    public void addBindingType(Annotation bindingType)
-    {
-        this.implBindingTypes.add(bindingType);
-    }
-
-    /**
      * Add new stereotype.
-     * 
+     *
      * @param stereoType new stereotype annotation
      */
     public void addStereoType(Annotation stereoType)
@@ -325,7 +315,7 @@
 
     /**
      * Add new api type.
-     * 
+     *
      * @param apiType new api type
      */
     public void addApiType(Class<?> apiType)
@@ -334,18 +324,18 @@
     }
 
     /**
-     * Get binding types.
-     * 
-     * @return binding types
+     * Get qualifiers.
+     *
+     * @return qualifiers
      */
-    public Set<Annotation> getImplBindingTypes()
+    public Set<Annotation> getImplQualifiers()
     {
-        return implBindingTypes;
+        return implQualifiers;
     }
 
     /**
      * Gets the stereotypes.
-     * 
+     *
      * @return stereotypes of the bean
      */
     public Set<Annotation> getOwbStereotypes()
@@ -354,6 +344,16 @@
     }
 
     /**
+     * Add new qualifier.
+     *
+     * @param qualifier new qualifier
+     */
+    public void addQualifier(Annotation qualifier)
+    {
+        this.implQualifiers.add(qualifier);
+    }
+
+    /**
      * Set name.
      * 
      * @param name new name
@@ -378,12 +378,12 @@
 
     /*
      * (non-Javadoc)
-     * @see javax.webbeans.manager.Bean#getBindingTypes()
+     * @see javax.webbeans.manager.Bean#getQualifiers()
      */
     @Override
-    public Set<Annotation> getBindings()
+    public Set<Annotation> getQualifiers()
     {
-        return this.implBindingTypes;
+        return this.implQualifiers;
     }
 
     /*
@@ -398,10 +398,10 @@
 
     /*
      * (non-Javadoc)
-     * @see javax.webbeans.manager.Bean#getScopeType()
+     * @see javax.webbeans.manager.Bean#getScope()
      */
     @Override
-    public Class<? extends Annotation> getScopeType()
+    public Class<? extends Annotation> getScope()
     {
         return this.implScopeType.annotationType();
     }
@@ -642,10 +642,10 @@
         
         builder.append("\t]\n");
         builder.append("\t,\n");
-        builder.append("\tBinding Types:\n");
+        builder.append("\tQualifiers:\n");
         builder.append("\t[\n");
         
-        for(Annotation ann : getBindings())
+        for(Annotation ann : getQualifiers())
         {
             builder.append("\t\t\t"+ann.annotationType().getName()+"\n");
         }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java Fri Sep  4 18:18:41 2009
@@ -135,8 +135,8 @@
         Object parentInstance = null;
 
         // Added for most specialized bean
-        Annotation[] anns = new Annotation[this.ownerComponent.getBindings().size()];
-        anns = this.ownerComponent.getBindings().toArray(anns);
+        Annotation[] anns = new Annotation[this.ownerComponent.getQualifiers().size()];
+        anns = this.ownerComponent.getQualifiers().toArray(anns);
 
         Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(), (AbstractBean<T>) this.ownerComponent);
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java Fri Sep  4 18:18:41 2009
@@ -103,11 +103,11 @@
     public abstract WebBeansType getWebBeansType();
 
     /**
-     * Adds binding type.
+     * Adds qualifier.
      * 
-     * @param bindingType bean binding type
+     * @param qualifier bean qualifier
      */
-    public abstract void addBindingType(Annotation bindingType);
+    public abstract void addQualifier(Annotation qualifier);
 
     /**
      * Adds new stereotype annotation.
@@ -131,11 +131,11 @@
     public abstract void addInjectionPoint(InjectionPoint injectionPoint);
 
     /**
-     * Returns set of binding type annotations.
+     * Returns set of qualifier annotations.
      * 
-     * @return set of binding type annotations
+     * @return set of qualifier annotations
      */
-    public abstract Set<Annotation> getImplBindingTypes();
+    public abstract Set<Annotation> getImplQualifiers();
 
     /**
      * Gets stereotypes annotations.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java Fri Sep  4 18:18:41 2009
@@ -50,10 +50,10 @@
     @Override
     protected T createInstance(CreationalContext<T> creationalContext)
     {
-        Set<Annotation> setBindingTypes = getBindings();
-        Annotation[] bindingTypes = new Annotation[setBindingTypes.size()];
+        Set<Annotation> setQualifiers = getQualifiers();
+        Annotation[] qualifiers = new Annotation[setQualifiers.size()];
 
-        bindingTypes = setBindingTypes.toArray(bindingTypes);
+        qualifiers = setQualifiers.toArray(qualifiers);
 
         T instance = null;
 
@@ -62,7 +62,7 @@
             Constructor<T> constructor = null;
             constructor = returnType.getConstructor(new Class<?>[] { Annotation[].class, Type.class });
 
-            instance = constructor.newInstance(new Object[] { bindingTypes, eventType });
+            instance = constructor.newInstance(new Object[] { qualifiers, eventType });
         }
         catch (Exception e)
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java Fri Sep  4 18:18:41 2009
@@ -33,7 +33,7 @@
         super(WebBeansType.INJECTIONPOINT,InjectionPoint.class);
         this.injectionPoint = injectionPoint;
         
-        addBindingType(new CurrentLiteral());
+        addQualifier(new CurrentLiteral());
         setImplScopeType(new DependentScopeLiteral());
         setType(new StandardLiteral());
         addApiType(InjectionPoint.class);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java Fri Sep  4 18:18:41 2009
@@ -37,8 +37,8 @@
     @Override
     protected Instance<T> createInstance(CreationalContext<Instance<T>> creationalContext)
     {
-        Annotation[] anns = new Annotation[getBindings().size()];
-        anns = getBindings().toArray(anns);
+        Annotation[] anns = new Annotation[getQualifiers().size()];
+        anns = getQualifiers().toArray(anns);
         
         return InstanceFactory.getInstance(this.injectedType, anns);
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java Fri Sep  4 18:18:41 2009
@@ -101,7 +101,7 @@
         }
         finally
         {
-            if (this.ownerComponent.getScopeType().equals(Dependent.class))
+            if (this.ownerComponent.getScope().equals(Dependent.class))
             {
                 destroyBean(this.ownerComponent, parentInstance);
             }
@@ -159,8 +159,8 @@
      */
     protected void checkNullInstance(Object instance)
     {
-        String errorMessage = "WebBeans producer field : " + producerField.getName() + " return type in the component implementation class : " + this.ownerComponent.getReturnType().getName() + " scope type must be @Dependent to create null instance";
-        WebBeansUtil.checkNullInstance(instance, this.getScopeType(), errorMessage);
+        String errorMessage = "WebBeans producer field : " + producerField.getName() + " return type in the component implementation class : " + this.ownerComponent.getReturnType().getName() + " scope must be @Dependent to create null instance";
+        WebBeansUtil.checkNullInstance(instance, this.getScope(), errorMessage);
     }
 
     /**
@@ -168,8 +168,8 @@
      */
     protected void checkScopeType()
     {
-        String errorMessage = "WebBeans producer method : " + producerField.getName() + " return type in the component implementation class : " + this.ownerComponent.getReturnType().getName() + " with passivating scope @" + this.getScopeType().getName() + " must be Serializable";
-        WebBeansUtil.checkSerializableScopeType(this.getScopeType(), this.isSerializable(), errorMessage);
+        String errorMessage = "WebBeans producer method : " + producerField.getName() + " return type in the component implementation class : " + this.ownerComponent.getReturnType().getName() + " with passivating scope @" + this.getScope().getName() + " must be Serializable";
+        WebBeansUtil.checkSerializableScopeType(this.getScope(), this.isSerializable(), errorMessage);
     }
 
     /**

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java Fri Sep  4 18:18:41 2009
@@ -170,7 +170,7 @@
         }
         finally
         {
-            if (getParent().getScopeType().equals(Dependent.class))
+            if (getParent().getScope().equals(Dependent.class))
             {
                 destroyBean(getParent(), parentInstance);
             }
@@ -229,7 +229,7 @@
             }
             finally
             {
-                if (getParent().getScopeType().equals(Dependent.class))
+                if (getParent().getScope().equals(Dependent.class))
                 {
                     destroyBean(getParent(), parentInstance);
 
@@ -246,7 +246,7 @@
     protected void checkNullInstance(Object instance)
     {
         String errorMessage = "WebBeans producer method : " + creatorMethod.getName() + " return type in the component implementation class : " + this.ownerComponent.getReturnType().getName() + " scope type must be @Dependent to create null instance";
-        WebBeansUtil.checkNullInstance(instance, this.getScopeType(), errorMessage);
+        WebBeansUtil.checkNullInstance(instance, this.getScope(), errorMessage);
     }
 
     /**
@@ -254,8 +254,8 @@
      */
     protected void checkScopeType()
     {
-        String errorMessage = "WebBeans producer method : " + creatorMethod.getName() + " return type in the component implementation class : " + this.ownerComponent.getReturnType().getName() + " with passivating scope @" + this.getScopeType().getName() + " must be Serializable";
-        WebBeansUtil.checkSerializableScopeType(this.getScopeType(), this.isSerializable(), errorMessage);
+        String errorMessage = "WebBeans producer method : " + creatorMethod.getName() + " return type in the component implementation class : " + this.ownerComponent.getReturnType().getName() + " with passivating scope @" + this.getScope().getName() + " must be Serializable";
+        WebBeansUtil.checkSerializableScopeType(this.getScope(), this.isSerializable(), errorMessage);
 
     }
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java Fri Sep  4 18:18:41 2009
@@ -100,15 +100,15 @@
      * {@inheritDoc}
      */
     @Override
-    public void defineBindingType()
+    public void defineQualifier()
     {
         if(isDefaultMetaDataProvider())
         {
-            DefinitionUtil.defineBindingTypes(this.bean, this.beanAnnotations);
+            DefinitionUtil.defineQualifiers(this.bean, this.beanAnnotations);
         }
         else
         {
-            //TODO Define Binding Types
+            //TODO Define Qualifiers
         }
         
     }
@@ -159,7 +159,7 @@
         if(isDefaultMetaDataProvider())
         {
             DefinitionUtil.defineScopeType(this.bean, this.beanAnnotations, errorMessage);
-            WebBeansUtil.checkPassivationScope(getBean(), getBean().getScopeType().getAnnotation(NormalScope.class));
+            WebBeansUtil.checkPassivationScope(getBean(), getBean().getScope().getAnnotation(NormalScope.class));
         }
         else
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java Fri Sep  4 18:18:41 2009
@@ -111,9 +111,9 @@
     public void defineScopeType(String errorMessage);
     
     /**
-     * Defines binding type.
+     * Defines qualifier.
      */
-    public void defineBindingType();
+    public void defineQualifier();
     
     /**
      * Defines bean name.

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java Fri Sep  4 18:18:41 2009
@@ -41,10 +41,10 @@
     }
     
     @Override
-    public Set<Annotation> getBindings()
+    public Set<Annotation> getQualifiers()
     {
         
-        return bean.getBindings();
+        return bean.getQualifiers();
     }
 
     @Override
@@ -69,10 +69,10 @@
     }
 
     @Override
-    public Class<? extends Annotation> getScopeType()
+    public Class<? extends Annotation> getScope()
     {
         
-        return bean.getScopeType();
+        return bean.getScope();
     }
 
     @Override

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java Fri Sep  4 18:18:41 2009
@@ -98,7 +98,7 @@
         }
         finally
         {
-            if (getParent().getScopeType().equals(Dependent.class))
+            if (getParent().getScope().equals(Dependent.class))
             {
                 destroyBean(getParent(), parentInstance);
             }

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -172,7 +172,7 @@
      * 
      * @param <T> generic class type
      * @param component configuring web beans component
-     * @param clazz bean implementation class
+     * @param type bean implementation class
      */
     public static <T> void defineProducerMethodApiTypes(AbstractBean<T> component, Type type)
     {
@@ -193,19 +193,19 @@
     }
 
     /**
-     * Configure web beans component binding type.
+     * Configure web beans component qualifier.
      * 
      * @param component configuring web beans component
      * @param annotations annotations
      */
-    public static <T> void defineBindingTypes(AbstractBean<T> component, Annotation[] annotations)
+    public static <T> void defineQualifiers(AbstractBean<T> component, Annotation[] annotations)
     {
         boolean find = false;
         for (Annotation annotation : annotations)
         {
             Class<? extends Annotation> type = annotation.annotationType();
 
-            if (AnnotationUtil.isBindingAnnotation(type))
+            if (AnnotationUtil.isQualifierAnnotation(type))
             {
                 Method[] methods = type.getDeclaredMethods();
 
@@ -216,7 +216,7 @@
                     {
                         if (!AnnotationUtil.isAnnotationExist(method.getDeclaredAnnotations(), NonBinding.class))
                         {
-                            throw new WebBeansConfigurationException("WebBeans definition class : " + component.getReturnType().getName() + " @BindingType : " + annotation.annotationType().getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
+                            throw new WebBeansConfigurationException("WebBeans definition class : " + component.getReturnType().getName() + " @Qualifier : " + annotation.annotationType().getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
                         }
                     }
                 }
@@ -226,22 +226,22 @@
                     find = true;
                 }
 
-                component.addBindingType(annotation);
+                component.addQualifier(annotation);
             }
         }
         
-        // Adding inherited binding types
+        // Adding inherited qualifiers
         IBeanInheritedMetaData inheritedMetaData = component.getInheritedMetaData();
         if (inheritedMetaData != null)
         {
-            Set<Annotation> inheritedTypes = inheritedMetaData.getInheritedBindingTypes();
+            Set<Annotation> inheritedTypes = inheritedMetaData.getInheritedQualifiers();
             for (Annotation inherited : inheritedTypes)
             {
-                Set<Annotation> bindings = component.getBindings();
+                Set<Annotation> qualifiers = component.getQualifiers();
                 boolean found = false;
-                for (Annotation existBinding : bindings)
+                for (Annotation existQualifier : qualifiers)
                 {
-                    if (existBinding.annotationType().equals(inherited.annotationType()))
+                    if (existQualifier.annotationType().equals(inherited.annotationType()))
                     {
                         found = true;
                         break;
@@ -249,22 +249,22 @@
                 }
                 if (!found)
                 {
-                    component.addBindingType(inherited);
+                    component.addQualifier(inherited);
                 }
             }
         }
         
 
         // No-binding annotation
-        if (component.getBindings().size() == 0)
+        if (component.getQualifiers().size() == 0)
         {
-            component.addBindingType(new CurrentLiteral());
+            component.addQualifier(new CurrentLiteral());
         }
         
         //Add @Any support
-        if(!AnnotationUtil.isAnyBindingExist(component))
+        if(!AnnotationUtil.isAnyQualifierExist(component))
         {
-        	component.addBindingType(new AnyLiteral());
+        	component.addQualifier(new AnyLiteral());
         }
         	 
     }
@@ -339,18 +339,18 @@
             }
         }
         
-        // Adding inherited binding types
+        // Adding inherited qualifiers
         IBeanInheritedMetaData inheritedMetaData = component.getInheritedMetaData();
         if (inheritedMetaData != null)
         {
             Set<Annotation> inheritedTypes = inheritedMetaData.getInheritedStereoTypes();        
             for (Annotation inherited : inheritedTypes)
             {
-                Set<Class<? extends Annotation>> bindings = component.getStereotypes();
+                Set<Class<? extends Annotation>> qualifiers = component.getStereotypes();
                 boolean found = false;
-                for (Class<? extends Annotation> existBinding : bindings)
+                for (Class<? extends Annotation> existQualifier : qualifiers)
                 {
-                    if (existBinding.equals(inherited.annotationType()))
+                    if (existQualifier.equals(inherited.annotationType()))
                     {
                         found = true;
                         break;
@@ -624,9 +624,9 @@
         Annotation[] methodAnns = method.getDeclaredAnnotations();
 
         DefinitionUtil.defineProducerMethodApiTypes(component, method.getGenericReturnType());
-        DefinitionUtil.defineScopeType(component, methodAnns, "WebBeans producer method : " + method.getName() + " in class " + parent.getReturnType().getName() + " must declare default @ScopeType annotation");        
+        DefinitionUtil.defineScopeType(component, methodAnns, "WebBeans producer method : " + method.getName() + " in class " + parent.getReturnType().getName() + " must declare default @Scope annotation");
         WebBeansUtil.checkProducerGenericType(component,method);        
-        DefinitionUtil.defineBindingTypes(component, methodAnns);
+        DefinitionUtil.defineQualifiers(component, methodAnns);
         DefinitionUtil.defineName(component, methodAnns, WebBeansUtil.getProducerDefaultName(method.getName()));
 
         //Drop from the specification
@@ -654,7 +654,7 @@
             component.setProducerField(field);
             component.addApiType(Object.class);
             component.addApiType(field.getType());
-            defineBindingTypes(component, field.getDeclaredAnnotations());
+            defineQualifiers(component, field.getDeclaredAnnotations());
             component.setImplScopeType(new DependentScopeLiteral());
             
             return component;
@@ -681,9 +681,9 @@
         Annotation[] fieldAnns = field.getDeclaredAnnotations();
 
         DefinitionUtil.defineProducerMethodApiTypes(component, returnType);
-        DefinitionUtil.defineScopeType(component, fieldAnns, "WebBeans producer method : " + field.getName() + " in class " + parent.getReturnType().getName() + " must declare default @ScopeType annotation");
+        DefinitionUtil.defineScopeType(component, fieldAnns, "WebBeans producer method : " + field.getName() + " in class " + parent.getReturnType().getName() + " must declare default @Scope annotation");
         WebBeansUtil.checkProducerGenericType(component,field);
-        DefinitionUtil.defineBindingTypes(component, fieldAnns);
+        DefinitionUtil.defineQualifiers(component, fieldAnns);
         DefinitionUtil.defineName(component, fieldAnns, field.getName());
 
         return component;
@@ -709,7 +709,7 @@
             WebBeansUtil.checkProducerMethodDisposal(declaredMethod, clazz.getName());
 
             Type type = AnnotationUtil.getMethodFirstParameterWithAnnotation(declaredMethod, Disposes.class);
-            Annotation[] annot = AnnotationUtil.getMethodFirstParameterBindingTypesWithGivenAnnotation(declaredMethod, Disposes.class);
+            Annotation[] annot = AnnotationUtil.getMethodFirstParameterQualifierWithGivenAnnotation(declaredMethod, Disposes.class);
 
 
             Set<Bean<?>> set = InjectionResolver.getInstance().implResolveByType(type, annot);
@@ -802,9 +802,9 @@
                 
                 if(ClassUtil.isPublic(field.getModifiers()))
                 {
-                    if(!component.getScopeType().equals(Dependent.class))
+                    if(!component.getScope().equals(Dependent.class))
                     {
-                        throw new WebBeansConfigurationException("If bean has a public modifier injection point, bean scope type must be defined as @Dependent");
+                        throw new WebBeansConfigurationException("If bean has a public modifier injection point, bean scope must be defined as @Dependent");
                     }
                 }                
                 
@@ -816,13 +816,13 @@
                     continue;
                 }
 
-                Annotation[] bindingAnns = AnnotationUtil.getBindingAnnotations(anns);
+                Annotation[] qualifierAnns = AnnotationUtil.getQualifierAnnotations(anns);
 
-                if (bindingAnns.length > 0)
+                if (qualifierAnns.length > 0)
                 {
-                    if (bindingAnns.length > 0)
+                    if (qualifierAnns.length > 0)
                     {
-                        WebBeansUtil.checkForNewBindingForDeployment(field.getGenericType(), clazz, field.getName(), anns);
+                        WebBeansUtil.checkForNewQualifierForDeployment(field.getGenericType(), clazz, field.getName(), anns);
                     }
 
                     int mod = field.getModifiers();
@@ -968,7 +968,7 @@
         {
             Annotation[] a = anns[i];
             Type t = type[i];
-            WebBeansUtil.checkForNewBindingForDeployment(t, clazz, method.getName(), a);
+            WebBeansUtil.checkForNewQualifierForDeployment(t, clazz, method.getName(), a);
         }
 
         if (method.getAnnotation(Produces.class) == null)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java Fri Sep  4 18:18:41 2009
@@ -125,11 +125,11 @@
         Annotation[] clazzAnns = clazz.getDeclaredAnnotations();
 
         DefinitionUtil.defineApiTypes(component, clazz);
-        DefinitionUtil.defineScopeType(component, clazzAnns, "Simple WebBean Component implementation class : " + clazz.getName() + " stereotypes must declare same @ScopeType annotations");
+        DefinitionUtil.defineScopeType(component, clazzAnns, "Simple WebBean Component implementation class : " + clazz.getName() + " stereotypes must declare same @Scope annotations");
         
         WebBeansUtil.checkGenericType(component);
-        WebBeansUtil.checkPassivationScope(component, component.getScopeType().getAnnotation(NormalScope.class));
-        DefinitionUtil.defineBindingTypes(component, clazzAnns);
+        WebBeansUtil.checkPassivationScope(component, component.getScope().getAnnotation(NormalScope.class));
+        DefinitionUtil.defineQualifiers(component, clazzAnns);
         DefinitionUtil.defineName(component, clazzAnns, WebBeansUtil.getSimpleWebBeanDefaultName(clazz.getSimpleName()));
 
         Constructor<T> constructor = WebBeansUtil.defineConstructor(clazz);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java Fri Sep  4 18:18:41 2009
@@ -542,7 +542,7 @@
                 if (beanObj instanceof ManagedBean)
                 {
                     ManagedBean<?> component = (ManagedBean<?>) beanObj;
-                    NormalScope scope = component.getScopeType().getAnnotation(NormalScope.class);
+                    NormalScope scope = component.getScope().getAnnotation(NormalScope.class);
                     if(scope != null)
                     {
                         if (scope.passivating())
@@ -643,8 +643,8 @@
             managedBeanCreator.defineStereoTypes();
             Class<? extends Annotation> deploymentType = managedBeanCreator.defineDeploymentType("There are more than one @DeploymentType annotation in ManagedBean implementation class : " + managedBean.getReturnType().getName());
             managedBeanCreator.defineApiType();
-            managedBeanCreator.defineScopeType("ManagedBean implementation class : " + clazz.getName() + " stereotypes must declare same @ScopeType annotations");
-            managedBeanCreator.defineBindingType();
+            managedBeanCreator.defineScopeType("ManagedBean implementation class : " + clazz.getName() + " stereotypes must declare same @Scope annotations");
+            managedBeanCreator.defineQualifier();
             managedBeanCreator.defineName(WebBeansUtil.getSimpleWebBeanDefaultName(clazz.getSimpleName()));
             managedBeanCreator.defineConstructor();            
             Set<ProducerMethodBean<?>> producerMethods = managedBeanCreator.defineProducerMethods();       

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java Fri Sep  4 18:18:41 2009
@@ -34,21 +34,21 @@
     /**Inherited class*/
     protected Class<?> inheritedClazz;
     
-    /**Inherited binding types*/
-    protected Set<Annotation> inheritedBindingTypes = new HashSet<Annotation>();
+    /**Inherited qualifiers*/
+    protected Set<Annotation> inheritedQualifiers = new HashSet<Annotation>();
     
     /**Inherited stereotypes*/
     protected Set<Annotation> inheritedStereoTypes = new HashSet<Annotation>();
     
-    /**Inherited interceptor binding types*/
-    protected Set<Annotation> inheritedInterceptorBindingTypes = new HashSet<Annotation>();
+    /**Inherited interceptor bindings*/
+    protected Set<Annotation> inheritedInterceptorBindings = new HashSet<Annotation>();
     
     /**Inherited scope type*/
     protected Annotation inheritedScopeType = null;
     
     /**Inherited deployment type*/
     protected Annotation inheritedDeploymentType = null;
-    
+
     /**
      * Create a new bean inherited data.
      * 
@@ -60,17 +60,17 @@
         this.component = component;
         this.inheritedClazz = inheritedClazz;
         
-        setInheritedBindingTypes();
+        setInheritedQualifiers();
         setInheritedDeploymentType();
-        setInheritedInterceptorBindingTypes();
+        setInheritedInterceptorBindings();
         setInheritedScopeType();
         setInheritedStereoTypes();
     }     
      
     
-    public Set<Annotation> getInheritedBindingTypes()
+    public Set<Annotation> getInheritedQualifiers()
     {
-        return this.inheritedBindingTypes;
+        return this.inheritedQualifiers;
     }
 
     public Set<Annotation> getInheritedStereoTypes()
@@ -78,9 +78,9 @@
         return this.inheritedStereoTypes;
     }
     
-    public Set<Annotation> getInheritedInterceptorBindingTypes()
+    public Set<Annotation> getInheritedInterceptorBindings()
     {
-        return this.inheritedInterceptorBindingTypes;
+        return this.inheritedInterceptorBindings;
     }
     
     public Annotation getInheritedScopeType()
@@ -107,7 +107,7 @@
     /**
      * @param inheritedBindingTypes the inheritedBindingTypes to set
      */
-    abstract protected void setInheritedBindingTypes();
+    abstract protected void setInheritedQualifiers();
 
     /**
      * @param inheritedStereoTypes the inheritedStereoTypes to set
@@ -115,9 +115,9 @@
     abstract protected void setInheritedStereoTypes();
 
     /**
-     * @param inheritedInterceptorBindingTypes the inheritedInterceptorBindingTypes to set
+     * @param inheritedInterceptorBindings the inheritedInterceptorBindingTypes to set
      */
-    abstract protected void setInheritedInterceptorBindingTypes();
+    abstract protected void setInheritedInterceptorBindings();
 
     /**
      * @param inheritedScopeType the inheritedScopeType to set
@@ -128,6 +128,6 @@
      * @param inheritedDeploymentType the inheritedDeploymentType to set
      */
     abstract protected void setInheritedDeploymentType();
-    
-    
+
+
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java Fri Sep  4 18:18:41 2009
@@ -25,7 +25,7 @@
 import javax.enterprise.inject.stereotype.Stereotype;
 import javax.inject.Qualifier;
 import javax.inject.Scope;
-import javax.interceptor.InterceptorBindingType;
+import javax.interceptor.InterceptorBinding;
 
 import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.util.AnnotationUtil;
@@ -38,11 +38,11 @@
     }
 
     
-    protected void setInheritedBindingTypes()
+    protected void setInheritedQualifiers()
     {
         if(this.inheritedClazz != Object.class)
         {
-            setInheritedTypes(getInheritedBindingTypes(), this.inheritedClazz, Qualifier.class);
+            setInheritedTypes(getInheritedQualifiers(), this.inheritedClazz, Qualifier.class);
         }        
     }
 
@@ -57,11 +57,11 @@
     }
 
     
-    protected void setInheritedInterceptorBindingTypes()
+    protected void setInheritedInterceptorBindings()
     {
         if(this.inheritedClazz != Object.class)
         {
-            setInheritedTypes(getInheritedInterceptorBindingTypes(), this.inheritedClazz, InterceptorBindingType.class);
+            setInheritedTypes(getInheritedInterceptorBindings(), this.inheritedClazz, InterceptorBinding.class);
         }        
         
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java?rev=811507&r1=811506&r2=811507&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/IBeanInheritedMetaData.java Fri Sep  4 18:18:41 2009
@@ -22,13 +22,13 @@
 public interface IBeanInheritedMetaData
 {
 
-    public Set<Annotation> getInheritedBindingTypes();
+    public Set<Annotation> getInheritedQualifiers();
 
     public Set<Annotation> getInheritedStereoTypes();
     
-    public Set<Annotation> getInheritedInterceptorBindingTypes();
+    public Set<Annotation> getInheritedInterceptorBindings();
     
     public Annotation getInheritedScopeType();
     
-    public Annotation getInheritedDeploymentType();    
+    public Annotation getInheritedDeploymentType();
 }

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=811507&r1=811506&r2=811507&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 Fri Sep  4 18:18:41 2009
@@ -280,7 +280,7 @@
     
     public BeanManager addContext(Context context)
     {
-        addContext(context.getScopeType(), ContextFactory.getCustomContext(context));
+        addContext(context.getScope(), ContextFactory.getCustomContext(context));
 
         return this;
 
@@ -585,7 +585,7 @@
             throw new WebBeansConfigurationException("Exception in getBeans method. Bean type can not be TypeVariable");
         }
         
-        AnnotationUtil.checkBindingTypeConditions(bindings);
+        AnnotationUtil.checkQualifierConditions(bindings);
         
         return this.injectionResolver.implResolveByType(beanType, bindings);
         
@@ -616,8 +616,8 @@
             return null;
         }
                 
-        Annotation[] bindings = new Annotation[injectionPoint.getBindings().size()];
-        bindings = injectionPoint.getBindings().toArray(bindings);
+        Annotation[] bindings = new Annotation[injectionPoint.getQualifiers().size()];
+        bindings = injectionPoint.getQualifiers().toArray(bindings);
         
         //Find the injection point Bean
         Bean<?> bean = injectionResolver.getInjectionPointBean(injectionPoint);
@@ -643,9 +643,9 @@
      * {@inheritDoc}
      */
     @Override
-    public Set<Annotation> getInterceptorBindingTypeDefinition(Class<? extends Annotation> bindingType)
+    public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> binding)
     {
-        Annotation[] annotations = AnnotationUtil.getInterceptorBindingMetaAnnotations(bindingType.getDeclaredAnnotations());
+        Annotation[] annotations = AnnotationUtil.getInterceptorBindingMetaAnnotations(binding.getDeclaredAnnotations());
         Set<Annotation> set = new HashSet<Annotation>();
         
         for(Annotation ann : annotations)
@@ -703,10 +703,10 @@
         beanInstance.setCreationalContext(creationalContext);
         
         //Get bean context
-        context = getContext(beanInstance.getScopeType());        
+        context = getContext(beanInstance.getScope());
         
         //Scope is normal
-        if (WebBeansUtil.isScopeTypeNormal(bean.getScopeType()))
+        if (WebBeansUtil.isScopeTypeNormal(bean.getScope()))
         {
             instance = context.get(beanInstance);
             
@@ -746,7 +746,7 @@
                 return instance;
             }
             
-            context = getContext(bean.getScopeType());
+            context = getContext(bean.getScope());
             instance = context.get((Bean<Object>)bean, creationalContext);                                
         }
         
@@ -800,11 +800,11 @@
     @Override
     public boolean isQualifier(Class<? extends Annotation> annotationType)
     {
-        return AnnotationUtil.isBindingAnnotation(annotationType);
+        return AnnotationUtil.isQualifierAnnotation(annotationType);
     }
 
     @Override
-    public boolean isInterceptorBindingType(Class<? extends Annotation> annotationType)
+    public boolean isInterceptorBinding(Class<? extends Annotation> annotationType)
     {
         return AnnotationUtil.isInterceptorBindingAnnotation(annotationType);
     }
@@ -905,7 +905,7 @@
             Annotated annotated = injectionPoint.getAnnotated();
             if (annotated.getAnnotations().size() == 1 && annotated.isAnnotationPresent(Default.class))
             {
-                if (!bean.getScopeType().equals(Dependent.class))
+                if (!bean.getScope().equals(Dependent.class))
                 {
                     throw new WebBeansConfigurationException("Bean " + bean + "scope can not define other scope except @Dependent to inject InjectionPoint");
                 }
@@ -935,6 +935,6 @@
     {
         // TODO Auto-generated method stub
         return null;
-    }    
-        
+    }
+
 }
\ No newline at end of file



Mime
View raw message