openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r820150 - in /incubator/openwebbeans/trunk: webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/ webbeans-impl/src/main/java/org/apache/webbeans/annotation/ webbeans-impl/src/main/java/org/apache/webbeans/config/ webbeans-impl/src/main/...
Date Wed, 30 Sep 2009 02:26:57 GMT
Author: dblevins
Date: Wed Sep 30 02:26:52 2009
New Revision: 820150

URL: http://svn.apache.org/viewvc?rev=820150&view=rev
Log:
Simple style change: Refactored isFooExist methods to hasFoo

Modified:
    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/annotation/WebBeansAnnotation.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/BeanInheritedMetaData.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/InjectionResolver.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/deployment/StereoTypeModel.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/inject/AlternativesManager.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/WebBeansInterceptorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ejb/EJBInterceptorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.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/XMLAnnotationTypeManager.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-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -85,13 +85,13 @@
     {
         Asserts.assertNotNull(ejbClass, "ejbClass parameter can not be null");
 
-        if (AnnotationUtil.isAnnotationExistOnClass(ejbClass, Decorator.class))
+        if (AnnotationUtil.hasClassAnnotation(ejbClass, Decorator.class))
         {
             throw new WebBeansConfigurationException(EjbConstants.EJB_WEBBEANS_ERROR_CLASS_PREFIX + ejbClass.getName() + " can not annotated with @Decorator");
 
         }
 
-        if (AnnotationUtil.isAnnotationExistOnClass(ejbClass, Interceptor.class))
+        if (AnnotationUtil.hasClassAnnotation(ejbClass, Interceptor.class))
         {
             throw new WebBeansConfigurationException(EjbConstants.EJB_WEBBEANS_ERROR_CLASS_PREFIX + ejbClass.getName() + " can not annotated with @Interceptor");
         }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java?rev=820150&r1=820149&r2=820150&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java Wed Sep 30 02:26:52 2009
@@ -76,7 +76,7 @@
     {
         WebBeansAnnotation anno = (WebBeansAnnotation) self;
 
-        if (isMethodExist(m) && proceed == null)
+        if (hasMethod(m) && proceed == null)
         {
             return anno.getAnnotationMembersValueMap().get(m.getName());
         }
@@ -202,7 +202,7 @@
         }
     }
 
-    private boolean isMethodExist(Method method)
+    private boolean hasMethod(Method method)
     {
         for (Method m : members)
         {

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -214,7 +214,7 @@
                     Class<?> clazz = method.getReturnType();
                     if (clazz.isArray() || clazz.isAnnotation())
                     {
-                        if (!AnnotationUtil.isAnnotationExist(method.getDeclaredAnnotations(), NonBinding.class))
+                        if (!AnnotationUtil.hasAnnotation(method.getDeclaredAnnotations(), NonBinding.class))
                         {
                             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");
                         }
@@ -262,7 +262,7 @@
         }
         
         //Add @Any support
-        if(!AnnotationUtil.isAnyQualifierExist(component))
+        if(!AnnotationUtil.hasAnyQualifier(component))
         {
         	component.addQualifier(new AnyLiteral());
         }
@@ -329,7 +329,7 @@
 
     public static <T> void defineStereoTypes(BaseBean<?> component, Annotation[] anns)
     {
-        if (AnnotationUtil.isStereoTypeMetaAnnotationExist(anns))
+        if (AnnotationUtil.hasStereoTypeMetaAnnotation(anns))
         {
             Annotation[] steroAnns = AnnotationUtil.getStereotypeMetaAnnotations(anns);
 
@@ -393,10 +393,10 @@
                 Set<Class<? extends Annotation>> anns = component.getStereotypes();
                 for (Class<? extends Annotation> stero : anns)
                 {
-                    boolean containsNormal = AnnotationUtil.isMetaAnnotationExist(stero.getDeclaredAnnotations(), NormalScope.class);
+                    boolean containsNormal = AnnotationUtil.hasMetaAnnotation(stero.getDeclaredAnnotations(), NormalScope.class);
                     
-                    if (AnnotationUtil.isMetaAnnotationExist(stero.getDeclaredAnnotations(), NormalScope.class) ||
-                            AnnotationUtil.isMetaAnnotationExist(stero.getDeclaredAnnotations(), Scope.class))
+                    if (AnnotationUtil.hasMetaAnnotation(stero.getDeclaredAnnotations(), NormalScope.class) ||
+                            AnnotationUtil.hasMetaAnnotation(stero.getDeclaredAnnotations(), Scope.class))
                     {                        
                         Annotation next = null;
                         
@@ -458,7 +458,7 @@
         if (nameAnnot == null) // no @Named
         {
             // Check for stereottype
-            if (WebBeansUtil.isNamedExistOnStereoTypes(component))
+            if (WebBeansUtil.hasNamedOnStereoTypes(component))
             {
                 isDefault = true;
             }
@@ -510,7 +510,7 @@
         for (Field field : fields)
         {            
             // Producer field
-            if (AnnotationUtil.isAnnotationExist(field.getDeclaredAnnotations(), Produces.class))
+            if (AnnotationUtil.hasAnnotation(field.getDeclaredAnnotations(), Produces.class))
             {
                 Type genericType = field.getGenericType();
                 
@@ -570,11 +570,11 @@
     private static <T> void createProducerComponents(AbstractBean<T> component, Set<ProducerMethodBean<?>> producerComponents, Method declaredMethod, Class<?> clazz, boolean isSpecializes)
     {
         // Producer Method
-        if (AnnotationUtil.isMethodHasAnnotation(declaredMethod, Produces.class))
+        if (AnnotationUtil.hasMethodAnnotation(declaredMethod, Produces.class))
         {
             WebBeansUtil.checkProducerMethodForDeployment(declaredMethod, clazz.getName());
 
-            if (AnnotationUtil.isMethodHasAnnotation(declaredMethod, Specializes.class))
+            if (AnnotationUtil.hasMethodAnnotation(declaredMethod, Specializes.class))
             {
                 if (ClassUtil.isStatic(declaredMethod.getModifiers()))
                 {
@@ -811,7 +811,7 @@
                 Annotation[] anns = field.getDeclaredAnnotations();
 
                 // Injected fields can not be @Decorates or @Produces
-                if (AnnotationUtil.isAnnotationExist(anns, Produces.class) || AnnotationUtil.isAnnotationExist(anns, Decorates.class))
+                if (AnnotationUtil.hasAnnotation(anns, Produces.class) || AnnotationUtil.hasAnnotation(anns, Decorates.class))
                 {
                     continue;
                 }
@@ -897,9 +897,9 @@
         
         for (Method method : methods)
         {
-            boolean isInitializer = AnnotationUtil.isMethodHasAnnotation(method, Inject.class);
+            boolean isInitializer = AnnotationUtil.hasMethodAnnotation(method, Inject.class);
             
-            boolean isResource = AnnotationUtil.isMethodHasResourceAnnotation(method);
+            boolean isResource = AnnotationUtil.hasResourceAnnotation(method);
 
             if (isInitializer && isResource)
             {

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -57,12 +57,12 @@
     {
         int modifier = clazz.getModifiers();
 
-        if (AnnotationUtil.isAnnotationExistOnClass(clazz, Decorator.class) && AnnotationUtil.isAnnotationExistOnClass(clazz, Interceptor.class))
+        if (AnnotationUtil.hasClassAnnotation(clazz, Decorator.class) && AnnotationUtil.hasClassAnnotation(clazz, Interceptor.class))
         {
             throw new WebBeansConfigurationException("Simple WebBean Component implementation class : " + clazz.getName() + " may not annotated with both @Interceptor and @Decorator annotation");
         }
 
-        if (!AnnotationUtil.isAnnotationExistOnClass(clazz, Decorator.class) && !AnnotationUtil.isAnnotationExistOnClass(clazz, Interceptor.class))
+        if (!AnnotationUtil.hasClassAnnotation(clazz, Decorator.class) && !AnnotationUtil.hasClassAnnotation(clazz, Interceptor.class))
         {
             InterceptorUtil.checkSimpleWebBeansInterceptorConditions(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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -314,8 +314,8 @@
                 Class<?> implClass = ClassUtil.getClassFromName(componentClassName);
 
                 //It must not be @Interceptor or @Decorator
-                if(AnnotationUtil.isAnnotationExistOnClass(implClass, javax.decorator.Decorator.class) ||
-                        AnnotationUtil.isAnnotationExistOnClass(implClass, Interceptor.class))
+                if(AnnotationUtil.hasClassAnnotation(implClass, javax.decorator.Decorator.class) ||
+                        AnnotationUtil.hasClassAnnotation(implClass, Interceptor.class))
                 {
                     continue;
                 }
@@ -580,7 +580,7 @@
                 
                 if (AnnotationUtil.isStereoTypeAnnotation(stereoClass))
                 {
-                    if (!XMLAnnotationTypeManager.getInstance().isStereoTypeExist(stereoClass))
+                    if (!XMLAnnotationTypeManager.getInstance().hasStereoType(stereoClass))
                     {
                         WebBeansUtil.checkStereoTypeClass(stereoClass);
                         StereoTypeModel model = new StereoTypeModel(stereoClass);
@@ -618,7 +618,7 @@
      */
     protected <T> void defineManagedBean(Class<T> clazz)
     {
-        if (!AnnotationUtil.isAnnotationExistOnClass(clazz, Interceptor.class) && !AnnotationUtil.isAnnotationExistOnClass(clazz, javax.decorator.Decorator.class))
+        if (!AnnotationUtil.hasClassAnnotation(clazz, Interceptor.class) && !AnnotationUtil.hasClassAnnotation(clazz, javax.decorator.Decorator.class))
         {
 
             AnnotatedType<T> annotatedType = AnnotatedElementFactory.newAnnotatedType(clazz);

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -125,7 +125,7 @@
         {
             if(!types.contains(annotation))
             {
-                if(AnnotationUtil.isAnnotationExistOnClass(annotation.annotationType(), Inherited.class))
+                if(AnnotationUtil.hasClassAnnotation(annotation.annotationType(), Inherited.class))
                 {
                     types.add(annotation);   
                 }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -812,7 +812,7 @@
     @Override
     public boolean isScope(Class<? extends Annotation> annotationType)
     {
-        if(AnnotationUtil.isAnnotationExist(annotationType.getDeclaredAnnotations(), Scope.class))
+        if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), Scope.class))
         {
             return true;
         }
@@ -823,7 +823,7 @@
     @Override
     public boolean isNormalScope(Class<? extends Annotation> annotationType)
     {
-        if(AnnotationUtil.isAnnotationExist(annotationType.getDeclaredAnnotations(), NormalScope.class))
+        if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), NormalScope.class))
         {
             return true;
         }
@@ -834,7 +834,7 @@
     @Override
     public boolean isPassivatingScope(Class<? extends Annotation> annotationType)
     {
-        if(AnnotationUtil.isAnnotationExist(annotationType.getDeclaredAnnotations(), NormalScope.class))
+        if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), NormalScope.class))
         {
             NormalScope scope = annotationType.getAnnotation(NormalScope.class);            
             return scope.passivating();
@@ -847,7 +847,7 @@
     @Override
     public boolean isStereotype(Class<? extends Annotation> annotationType)
     {
-        if(AnnotationUtil.isAnnotationExist(annotationType.getDeclaredAnnotations(), Stereotype.class))
+        if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), Stereotype.class))
         {
             return true;
         }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -446,7 +446,7 @@
                     Annotation qualifier = itQualifiers.next();
                     if (annot.annotationType().equals(qualifier.annotationType()))
                     {
-                        if (AnnotationUtil.isAnnotationMemberExist(qualifier.annotationType(), qualifier, annot))
+                        if (AnnotationUtil.hasAnnotationMember(qualifier.annotationType(), qualifier, annot))
                         {
                             i++;
                         }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -97,7 +97,7 @@
         boolean found = false;
         for (Field field : fields)
         {
-            if (AnnotationUtil.isAnnotationExist(field.getDeclaredAnnotations(), Decorates.class))
+            if (AnnotationUtil.hasAnnotation(field.getDeclaredAnnotations(), Decorates.class))
             {
                 if (found)
                 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -162,7 +162,7 @@
                 boolean bindingOk = false;
                 for (Annotation bindingType : delegateBindings)
                 {
-                    if (AnnotationUtil.isAnnotationMemberExist(bindingType.annotationType(), annot, bindingType))
+                    if (AnnotationUtil.hasAnnotationMember(bindingType.annotationType(), annot, bindingType))
                     {
                         bindingOk = true;
                         break;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=820150&r1=820149&r2=820150&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Wed Sep 30 02:26:52 2009
@@ -59,22 +59,22 @@
     {
         this.name = clazz.getName();
 
-        if (AnnotationUtil.isMetaAnnotationExist(clazz.getDeclaredAnnotations(), DeploymentType.class))
+        if (AnnotationUtil.hasMetaAnnotation(clazz.getDeclaredAnnotations(), DeploymentType.class))
         {
             this.defaultDeploymentType = AnnotationUtil.getMetaAnnotations(clazz.getDeclaredAnnotations(), DeploymentType.class)[0];
         }
 
-        if (AnnotationUtil.isMetaAnnotationExist(clazz.getDeclaredAnnotations(), NormalScope.class))
+        if (AnnotationUtil.hasMetaAnnotation(clazz.getDeclaredAnnotations(), NormalScope.class))
         {
             this.defaultScopeType = AnnotationUtil.getMetaAnnotations(clazz.getDeclaredAnnotations(), NormalScope.class)[0];
         }
 
-        if (AnnotationUtil.isMetaAnnotationExist(clazz.getDeclaredAnnotations(), Scope.class))
+        if (AnnotationUtil.hasMetaAnnotation(clazz.getDeclaredAnnotations(), Scope.class))
         {
             this.defaultScopeType = AnnotationUtil.getMetaAnnotations(clazz.getDeclaredAnnotations(), Scope.class)[0];
         }
         
-        if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(clazz.getDeclaredAnnotations()))
+        if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(clazz.getDeclaredAnnotations()))
         {
             Annotation[] ibs = AnnotationUtil.getInterceptorBindingMetaAnnotations(clazz.getDeclaredAnnotations());
             for (Annotation ann : ibs)
@@ -83,7 +83,7 @@
             }
         }
 
-        if (AnnotationUtil.isStereoTypeMetaAnnotationExist(clazz.getDeclaredAnnotations()))
+        if (AnnotationUtil.hasStereoTypeMetaAnnotation(clazz.getDeclaredAnnotations()))
         {
             Annotation[] isy = AnnotationUtil.getStereotypeMetaAnnotations(clazz.getDeclaredAnnotations());
 

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -85,18 +85,18 @@
         Asserts.assertNotNull(candidateObserverMethod, "candidateObserverMethod parameter can not be null");
         Asserts.nullCheckForClass(clazz);
 
-        if (AnnotationUtil.isMethodMultipleParameterAnnotationExist(candidateObserverMethod, Observes.class))
+        if (AnnotationUtil.hasMethodMultipleParameterAnnotation(candidateObserverMethod, Observes.class))
         {
             throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : " + clazz.getName() + " can not define two parameters with annotated @Observes");
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(candidateObserverMethod, Produces.class) || AnnotationUtil.isMethodHasAnnotation(candidateObserverMethod, Inject.class))
+        if (AnnotationUtil.hasMethodAnnotation(candidateObserverMethod, Produces.class) || AnnotationUtil.hasMethodAnnotation(candidateObserverMethod, Inject.class))
         {
             throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : " + clazz.getName() + " can not annotated with annotation in the list {@Produces, @Initializer, @Destructor}");
 
         }
 
-        if (AnnotationUtil.isMethodParameterAnnotationExist(candidateObserverMethod, Disposes.class))
+        if (AnnotationUtil.hasMethodParameterAnnotation(candidateObserverMethod, Disposes.class))
         {
             throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : " + clazz.getName() + " can not annotated with annotation @Disposes");
         }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -213,7 +213,7 @@
         {
             Observer<Object> observer = it.next();
             try
-            {             
+            {
                 if(observer instanceof BeanObserverImpl)
                 {
                     BeanObserverImpl<Object> beanObserver = (BeanObserverImpl<Object>) observer;
@@ -221,11 +221,11 @@
                     if (!(type.equals(TransactionalObserverType.NONE)))
                     {
                         Transaction transaction = transactionService.getTransaction();
-                        
+
                         if (transaction != null)
                         {
                             transaction.registerSynchronization(this);
-                        
+
                             if (transNotifier == null)
                             {
                                 transNotifier = new TransactionalNotifier(event);
@@ -252,14 +252,14 @@
                         }
                         else
                         {
-                            observer.notify(event);   
+                            observer.notify(event);
                         }
                     }
                     else
                     {
-                        observer.notify(event);   
+                        observer.notify(event);
                     }
-                    
+
                 }
                 else
                 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java?rev=820150&r1=820149&r2=820150&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java Wed Sep 30 02:26:52 2009
@@ -49,7 +49,7 @@
             boolean ok = false;
             if(AnnotationUtil.isStereoTypeAnnotation(stereo))
             {
-                if(AnnotationUtil.isAnnotationExistOnClass(stereo, Alternative.class))
+                if(AnnotationUtil.hasClassAnnotation(stereo, Alternative.class))
                 {
                     if(this.stereoAlternatives.contains(stereo))
                     {
@@ -75,7 +75,7 @@
     
     public void addClazzAlternative(Class<?> alternative)
     {
-        if(AnnotationUtil.isAnnotationExistOnClass(alternative, Alternative.class))
+        if(AnnotationUtil.hasClassAnnotation(alternative, Alternative.class))
         {
             if(this.alternatives.contains(alternative))
             {

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -206,10 +206,10 @@
         boolean isMethodAnnotatedWithInterceptorClass = false;
         boolean isMethodAnnotatedWithExcludeInterceptorClass = false;
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, Interceptors.class))
+        if (AnnotationUtil.hasMethodAnnotation(method, Interceptors.class))
             isMethodAnnotatedWithInterceptorClass = true;
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, ExcludeClassInterceptors.class))
+        if (AnnotationUtil.hasMethodAnnotation(method, ExcludeClassInterceptors.class))
             isMethodAnnotatedWithExcludeInterceptorClass = true;
 
         Iterator<InterceptorData> it = stack.iterator();
@@ -265,12 +265,12 @@
         boolean isMethodAnnotatedWithInterceptorClass = false;
         boolean isMethodAnnotatedWithExcludeInterceptorClass = false;
 
-        if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(method.getDeclaredAnnotations()))
+        if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(method.getDeclaredAnnotations()))
         {
             isMethodAnnotatedWithInterceptorClass = true;
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, ExcludeClassInterceptors.class))
+        if (AnnotationUtil.hasMethodAnnotation(method, ExcludeClassInterceptors.class))
         {
             isMethodAnnotatedWithExcludeInterceptorClass = true;
         }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -52,17 +52,17 @@
             return false;
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, Inject.class))
+        if (AnnotationUtil.hasMethodAnnotation(method, Inject.class))
         {
             return false;
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, PreDestroy.class) || AnnotationUtil.isMethodHasAnnotation(method, PostConstruct.class) || AnnotationUtil.isMethodHasAnnotation(method, AroundInvoke.class))
+        if (AnnotationUtil.hasMethodAnnotation(method, PreDestroy.class) || AnnotationUtil.hasMethodAnnotation(method, PostConstruct.class) || AnnotationUtil.hasMethodAnnotation(method, AroundInvoke.class))
         {
             return false;
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, Produces.class) || AnnotationUtil.isMethodParameterAnnotationExist(method, Disposes.class) || AnnotationUtil.isMethodParameterAnnotationExist(method, Observes.class))
+        if (AnnotationUtil.hasMethodAnnotation(method, Produces.class) || AnnotationUtil.hasMethodParameterAnnotation(method, Disposes.class) || AnnotationUtil.hasMethodParameterAnnotation(method, Observes.class))
         {
             return true;
         }
@@ -104,7 +104,7 @@
         Method[] methods = clazz.getDeclaredMethods();
         for (Method method : methods)
         {
-            if (AnnotationUtil.isMethodHasAnnotation(method, AroundInvoke.class))
+            if (AnnotationUtil.hasMethodAnnotation(method, AroundInvoke.class))
             {
                 if (ClassUtil.isMethodHasParameter(method))
                 {
@@ -136,7 +136,7 @@
         Method[] methods = clazz.getDeclaredMethods();
         for (Method method : methods)
         {
-            if (AnnotationUtil.isMethodHasAnnotation(method, PostConstruct.class) || AnnotationUtil.isMethodHasAnnotation(method, PreDestroy.class) 
+            if (AnnotationUtil.hasMethodAnnotation(method, PostConstruct.class) || AnnotationUtil.hasMethodAnnotation(method, PreDestroy.class)
 //                    AnnotationUtil.isMethodHasAnnotation(method, PostActivate.class) || 
 //                    AnnotationUtil.isMethodHasAnnotation(method, PrePassivate.class)
                     )
@@ -168,7 +168,7 @@
     public static void checkInterceptorConditions(Class<?> clazz)
     {
         Asserts.nullCheckForClass(clazz);
-        if (!AnnotationUtil.isInterceptorBindingMetaAnnotationExist(clazz.getDeclaredAnnotations()))
+        if (!AnnotationUtil.hasInterceptorBindingMetaAnnotation(clazz.getDeclaredAnnotations()))
         {
             throw new WebBeansConfigurationException("WebBeans Interceptor class : " + clazz.getName() + " must have at least one @InterceptorBinding annotation");
         }
@@ -213,7 +213,7 @@
             Annotation[] stereoTypes = AnnotationUtil.getStereotypeMetaAnnotations(clazz.getDeclaredAnnotations());
             for (Annotation stero : stereoTypes)
             {
-                if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(stero.annotationType().getDeclaredAnnotations()))
+                if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(stero.annotationType().getDeclaredAnnotations()))
                 {
                     hasClassInterceptors = true;
                     break;
@@ -240,7 +240,7 @@
                 }
                 else
                 {
-                    if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(method.getDeclaredAnnotations()))
+                    if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(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 @InterceptorBinding");
                     }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -87,7 +87,7 @@
     {
         Class<?> clazz = component.getReturnType();
         
-        if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(clazz.getDeclaredAnnotations()))
+        if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(clazz.getDeclaredAnnotations()))
         {
 
             Set<Annotation> bindingTypeSet = new HashSet<Annotation>();
@@ -102,7 +102,7 @@
             Annotation[] stereoTypes = AnnotationUtil.getStereotypeMetaAnnotations(clazz.getDeclaredAnnotations());
             for (Annotation stero : stereoTypes)
             {
-                if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(stero.annotationType().getDeclaredAnnotations()))
+                if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(stero.annotationType().getDeclaredAnnotations()))
                 {
                     Annotation[] steroInterceptorBindings = AnnotationUtil.getInterceptorBindingMetaAnnotations(stero.annotationType().getDeclaredAnnotations());
 
@@ -160,7 +160,7 @@
 
         for (Method method : methods)
         {
-            if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(method.getAnnotations()))
+            if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(method.getAnnotations()))
             {
                 Annotation[] anns = AnnotationUtil.getInterceptorBindingMetaAnnotations(method.getDeclaredAnnotations());
                 Annotation[] annsClazz = AnnotationUtil.getInterceptorBindingMetaAnnotations(clazz.getDeclaredAnnotations());
@@ -180,7 +180,7 @@
                 Annotation[] stereoTypes = AnnotationUtil.getStereotypeMetaAnnotations(clazz.getDeclaredAnnotations());
                 for (Annotation stero : stereoTypes)
                 {
-                    if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(stero.annotationType().getDeclaredAnnotations()))
+                    if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(stero.annotationType().getDeclaredAnnotations()))
                     {
                         Annotation[] steroInterceptorBindings = AnnotationUtil.getInterceptorBindingMetaAnnotations(stero.annotationType().getDeclaredAnnotations());
 
@@ -243,7 +243,7 @@
         {
             interceptor = (WebBeansInterceptor<?>) it.next();
 
-            if (interceptor.isBindingExist(bindingTypes, listAnnot))
+            if (interceptor.hasBinding(bindingTypes, listAnnot))
             {
                 set.add(interceptor);
                 set.addAll(interceptor.getMetaInceptors());

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ejb/EJBInterceptorConfig.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ejb/EJBInterceptorConfig.java?rev=820150&r1=820149&r2=820150&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ejb/EJBInterceptorConfig.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ejb/EJBInterceptorConfig.java Wed Sep 30 02:26:52 2009
@@ -53,7 +53,7 @@
     {
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
 
-        if (AnnotationUtil.isAnnotationExistOnClass(clazz, Interceptors.class))
+        if (AnnotationUtil.hasClassAnnotation(clazz, Interceptors.class))
         {
             Interceptors incs = clazz.getAnnotation(Interceptors.class);
             Class<?>[] intClasses = incs.value();

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -102,7 +102,7 @@
             Class<?> clazz = method.getReturnType();
             if (clazz.isArray() || clazz.isAnnotation())
             {
-                if (!AnnotationUtil.isAnnotationExist(method.getAnnotations(), NonBinding.class))
+                if (!AnnotationUtil.hasAnnotation(method.getAnnotations(), NonBinding.class))
                 {
                     throw new WebBeansConfigurationException("Interceptor definition class : " + getClazz().getName() + " @InterceptorBinding : " + binding.getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
                 }
@@ -120,7 +120,7 @@
      * @param annots binding types annots.
      * @return true if binding types exist ow false
      */
-    public boolean isBindingExist(List<Class<? extends Annotation>> bindingTypes, List<Annotation> annots)
+    public boolean hasBinding(List<Class<? extends Annotation>> bindingTypes, List<Annotation> annots)
     {
         boolean result = false;
 
@@ -132,7 +132,7 @@
                 if (this.interceptorBindingSet.containsKey(bindingType))
                 {
                     Annotation target = this.interceptorBindingSet.get(bindingType);
-                    if (AnnotationUtil.isAnnotationMemberExist(bindingType, annots.get(i), target))
+                    if (AnnotationUtil.hasAnnotationMember(bindingType, annots.get(i), target))
                     {
                         result = true;
                     }
@@ -176,14 +176,14 @@
             Set<Annotation> declared = null;
             Annotation[] anns = null;
 
-            if (XMLAnnotationTypeManager.getInstance().isInterceptorBindingTypeExist(clazzAnnot))
+            if (XMLAnnotationTypeManager.getInstance().hasInterceptorBindingType(clazzAnnot))
             {
                 declared = XMLAnnotationTypeManager.getInstance().getInterceptorBindingTypeInherites(clazzAnnot);
                 anns = new Annotation[declared.size()];
                 anns = declared.toArray(anns);
             }
 
-            else if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(clazzAnnot.getDeclaredAnnotations()))
+            else if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(clazzAnnot.getDeclaredAnnotations()))
             {
                 anns = AnnotationUtil.getInterceptorBindingMetaAnnotations(clazzAnnot.getDeclaredAnnotations());
             }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -59,7 +59,7 @@
      * @param clazz annotation class
      * @return true or false
      */
-    public static boolean isMethodHasAnnotation(Method method, Class<? extends Annotation> clazz)
+    public static boolean hasMethodAnnotation(Method method, Class<? extends Annotation> clazz)
     {
         Asserts.assertNotNull(method, "Method argument can not be null");
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
@@ -83,7 +83,7 @@
      * @param method method
      * @return <code>true</code> if any resource annotation exists for the given method
      */
-    public static boolean isMethodHasResourceAnnotation(Method method)
+    public static boolean hasResourceAnnotation(Method method)
     {
         Asserts.assertNotNull(method, "Method argument can not be null");
         
@@ -99,7 +99,7 @@
      * @param annotation checking annotation
      * @return true or false
      */
-    public static boolean isMethodParameterAnnotationExist(Method method, Class<? extends Annotation> clazz)
+    public static boolean hasMethodParameterAnnotation(Method method, Class<? extends Annotation> clazz)
     {
         Asserts.assertNotNull(method, "Method argument can not be null");
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
@@ -197,7 +197,7 @@
      * @param annotation checking annotation
      * @return true or false
      */
-    public static boolean isMethodMultipleParameterAnnotationExist(Method method, Class<? extends Annotation> clazz)
+    public static boolean hasMethodMultipleParameterAnnotation(Method method, Class<? extends Annotation> clazz)
     {
         Asserts.assertNotNull(method, "Method argument can not be null");
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
@@ -365,7 +365,7 @@
      * @param annotation checking annotation
      * @return true or false
      */
-    public static boolean isMethodParameterAnnotationCrossRefExist(Method method, Class<? extends Annotation> clazz)
+    public static boolean hasMethodParameterAnnotationCrossRef(Method method, Class<? extends Annotation> clazz)
     {
         Asserts.assertNotNull(method, "Method argument can not be null");
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
@@ -400,7 +400,7 @@
      * @param member annotation for querying the binding type
      * @return true or false
      */
-    public static boolean isAnnotationMemberExist(Class<? extends Annotation> clazz, Annotation src, Annotation member)
+    public static boolean hasAnnotationMember(Class<? extends Annotation> clazz, Annotation src, Annotation member)
     {
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
         Asserts.assertNotNull(src, "Src argument can not be null");
@@ -562,7 +562,7 @@
 
         for (Method m : methods)
         {
-            if (isMethodParameterAnnotationExist(m, annotation))
+            if (hasMethodParameterAnnotation(m, annotation))
             {
                 list.add(m);
             }
@@ -592,7 +592,7 @@
 
         for (Method m : methods)
         {
-            if (isMethodHasAnnotation(m, annotation))
+            if (hasMethodAnnotation(m, annotation))
             {
                 list.add(m);
             }
@@ -611,7 +611,7 @@
      * @param annotation annotation class
      * @return return true or false
      */
-    public static boolean isAnnotationExistOnClass(Class<?> clazz, Class<? extends Annotation> annotation)
+    public static boolean hasClassAnnotation(Class<?> clazz, Class<? extends Annotation> annotation)
     {
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
         Asserts.assertNotNull(annotation, "Annotation argument can not be null");
@@ -626,7 +626,7 @@
         return false;
     }
 
-    public static boolean isMetaAnnotationExist(Annotation[] anns, Class<? extends Annotation> metaAnnotation)
+    public static boolean hasMetaAnnotation(Annotation[] anns, Class<? extends Annotation> metaAnnotation)
     {
         Asserts.assertNotNull(anns, "Anns argument can not be null");
         Asserts.assertNotNull(metaAnnotation, "MetaAnnotation argument can not be null");
@@ -643,7 +643,7 @@
 
     }
 
-    public static boolean isAnnotationExist(Annotation[] anns, Class<? extends Annotation> annotation)
+    public static boolean hasAnnotation(Annotation[] anns, Class<? extends Annotation> annotation)
     {
         return getAnnotation(anns, annotation) != null;
     }
@@ -668,7 +668,14 @@
 
         return null;
     }
-    
+
+    /**
+     * Returns a subset of annotations that are annotated with the specified meta-annotation
+     * 
+     * @param anns
+     * @param metaAnnotation
+     * @return
+     */
     public static Annotation[] getMetaAnnotations(Annotation[] anns, Class<? extends Annotation> metaAnnotation)
     {
         List<Annotation> annots = new ArrayList<Annotation>();
@@ -725,7 +732,7 @@
                 Class<?> clazz = method.getReturnType();
                 if (clazz.isArray() || clazz.isAnnotation())
                 {
-                    if (!AnnotationUtil.isAnnotationExist(method.getDeclaredAnnotations(), NonBinding.class))
+                    if (!AnnotationUtil.hasAnnotation(method.getDeclaredAnnotations(), NonBinding.class))
                     {
                         throw new WebBeansConfigurationException("@Qualifier : " + ann.annotationType().getName() + " must have @NonBinding valued members for its array-valued and annotation valued members");
                     }
@@ -768,7 +775,7 @@
     {
         Asserts.assertNotNull(clazz, "clazz parameter can not be null");
         XMLAnnotationTypeManager manager = XMLAnnotationTypeManager.getInstance();
-        if (manager.isBindingTypeExist(clazz))
+        if (manager.hasBindingType(clazz))
         {
             return true;
         }
@@ -787,7 +794,7 @@
      * @param bean bean
      * @return true if any binding exist
      */
-    public static boolean isAnyQualifierExist(Bean<?> bean)
+    public static boolean hasAnyQualifier(Bean<?> bean)
     {
     	Asserts.assertNotNull(bean, "bean parameter can not be null");
     	Set<Annotation> qualifiers = bean.getQualifiers();
@@ -871,7 +878,7 @@
     {
         Asserts.assertNotNull(clazz, "clazz parameter can not be null");
         XMLAnnotationTypeManager manager = XMLAnnotationTypeManager.getInstance();
-        if (manager.isInterceptorBindingTypeExist(clazz))
+        if (manager.hasInterceptorBindingType(clazz))
         {
             return true;
         }
@@ -891,7 +898,7 @@
      * @return true if candidate class has an interceptor binding annotation
      *         type false otherwise
      */
-    public static boolean isInterceptorBindingMetaAnnotationExist(Annotation[] anns)
+    public static boolean hasInterceptorBindingMetaAnnotation(Annotation[] anns)
     {
         Asserts.assertNotNull(anns, "anns parameter can not be null");
 
@@ -948,7 +955,7 @@
         return ret;
     }
 
-    public static boolean isStereoTypeMetaAnnotationExist(Annotation[] anns)
+    public static boolean hasStereoTypeMetaAnnotation(Annotation[] anns)
     {
         Asserts.assertNotNull(anns, "anns parameter can not be null");
 
@@ -979,7 +986,7 @@
     {
         Asserts.assertNotNull(clazz, "clazz parameter can not be null");
         XMLAnnotationTypeManager manager = XMLAnnotationTypeManager.getInstance();
-        if (manager.isStereoTypeExist(clazz))
+        if (manager.hasStereoType(clazz))
         {
             return true;
         }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=820150&r1=820149&r2=820150&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Wed Sep 30 02:26:52 2009
@@ -738,7 +738,7 @@
      * @param clazz class type
      * @return true if class has a default constructor.
      */
-    public static <T> boolean isDefaultConstructorExist(Class<T> clazz)
+    public static <T> boolean hasDefaultConstructor(Class<T> clazz)
     {
         Asserts.nullCheckForClass(clazz);
         
@@ -1260,7 +1260,7 @@
         return null;
     }
 
-    public static boolean isMethodExistWithName(Class<?> clazz, String methodName)
+    public static boolean hasMethodWithName(Class<?> clazz, String methodName)
     {
         Asserts.nullCheckForClass(clazz);
         Asserts.assertNotNull(methodName, "methodName parameter can not be null");
@@ -1690,7 +1690,7 @@
         Field[] fields = clazz.getDeclaredFields();
         for (Field field : fields)
         {
-            if (AnnotationUtil.isAnnotationExist(field.getAnnotations(), annotation))
+            if (AnnotationUtil.hasAnnotation(field.getAnnotations(), annotation))
             {
                 return field;
             }
@@ -1819,5 +1819,5 @@
         
         return rawType;
     }
-    
+
 }

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -283,7 +283,7 @@
         if (!ClassUtil.isStatic(modifier) && ClassUtil.isInnerClazz(clazz))
             throw new WebBeansConfigurationException("Bean implementation class : " + clazz.getName() + " can not be non-static inner class");
 
-        if (!ClassUtil.isConcrete(clazz) && !AnnotationUtil.isAnnotationExistOnClass(clazz, Decorator.class))
+        if (!ClassUtil.isConcrete(clazz) && !AnnotationUtil.hasClassAnnotation(clazz, Decorator.class))
             throw new WebBeansConfigurationException("Bean implementation class : " + clazz.getName() + " have to be concrete if not defines as @Decorator");
                 
         if (!isConstructureOk(clazz))
@@ -414,7 +414,7 @@
     {
         Asserts.assertNotNull(method, "Method argument can not be null");
 
-        if (AnnotationUtil.isMethodHasAnnotation(method, Inject.class) || AnnotationUtil.isMethodParameterAnnotationExist(method, Disposes.class) || AnnotationUtil.isMethodParameterAnnotationExist(method, Observes.class))
+        if (AnnotationUtil.hasMethodAnnotation(method, Inject.class) || AnnotationUtil.hasMethodParameterAnnotation(method, Disposes.class) || AnnotationUtil.hasMethodParameterAnnotation(method, Observes.class))
         {
             throw new WebBeansConfigurationException("Producer Method Bean with name : " + method.getName() + " in bean class : " + parentImplClazzName + " can not be annotated with" + " @Initializer/@Destructor annotation or has a parameter annotated with @Disposes/@Observes");
         }
@@ -427,12 +427,12 @@
      */
     public static void checkProducerMethodDisposal(Method disposalMethod, String definedBeanClassName)
     {
-        if (AnnotationUtil.isMethodMultipleParameterAnnotationExist(disposalMethod, Disposes.class))
+        if (AnnotationUtil.hasMethodMultipleParameterAnnotation(disposalMethod, Disposes.class))
         {
             throw new WebBeansConfigurationException("Disposal method : " + disposalMethod.getName() + " in class " + definedBeanClassName + " has multiple @Disposes annotation parameter");
         }
 
-        if (AnnotationUtil.isMethodHasAnnotation(disposalMethod, Inject.class) || AnnotationUtil.isMethodParameterAnnotationExist(disposalMethod, Observes.class) || AnnotationUtil.isMethodHasAnnotation(disposalMethod, Produces.class))
+        if (AnnotationUtil.hasMethodAnnotation(disposalMethod, Inject.class) || AnnotationUtil.hasMethodParameterAnnotation(disposalMethod, Observes.class) || AnnotationUtil.hasMethodAnnotation(disposalMethod, Produces.class))
         {
             throw new WebBeansConfigurationException("Disposal method : " + disposalMethod.getName() + " in the class : " + definedBeanClassName + " can not be annotated with" + " @Initializer/@Destructor/@Produces annotation or has a parameter annotated with @Observes");
         }
@@ -771,7 +771,7 @@
         boolean found = false;
         for (Method method : methods)
         {
-            if (AnnotationUtil.isMethodHasAnnotation(method, commonAnnotation))
+            if (AnnotationUtil.hasMethodAnnotation(method, commonAnnotation))
             {
                 if (ClassUtil.isMoreThanOneMethodWithName(method.getName(), clazz))
                 {
@@ -844,7 +844,7 @@
         boolean found = false;
         for (Method method : methods)
         {
-            if (AnnotationUtil.isMethodHasAnnotation(method, AroundInvoke.class))
+            if (AnnotationUtil.hasMethodAnnotation(method, AroundInvoke.class))
             {
                 // Overriden methods
                 if (ClassUtil.isMoreThanOneMethodWithName(method.getName(), clazz))
@@ -1101,7 +1101,7 @@
         Set<Annotation> set = component.getOwbStereotypes();
         Annotation[] anns = new Annotation[set.size()];
         anns = set.toArray(anns);
-        if (AnnotationUtil.isStereoTypeMetaAnnotationExist(anns))
+        if (AnnotationUtil.hasStereoTypeMetaAnnotation(anns))
         {
             return true;
         }
@@ -1134,13 +1134,13 @@
      * @param bean bean instance
      * @return true if name exists
      */
-    public static boolean isNamedExistOnStereoTypes(BaseBean<?> bean)
+    public static boolean hasNamedOnStereoTypes(BaseBean<?> bean)
     {
         Annotation[] types = getComponentStereoTypes(bean);
-
+        
         for (Annotation ann : types)
         {
-            if (AnnotationUtil.isAnnotationExistOnClass(ann.annotationType(), Named.class))
+            if (AnnotationUtil.hasClassAnnotation(ann.annotationType(), Named.class))
             {
                 return true;
             }
@@ -1158,7 +1158,7 @@
         {
             for (Annotation dt : deploymentTypes)
             {
-                if (AnnotationUtil.isMetaAnnotationExist(dt.annotationType().getDeclaredAnnotations(), DeploymentType.class))
+                if (AnnotationUtil.hasMetaAnnotation(dt.annotationType().getDeclaredAnnotations(), DeploymentType.class))
                 {
                     Annotation result2[] = AnnotationUtil.getMetaAnnotations(dt.annotationType().getDeclaredAnnotations(), DeploymentType.class);
 
@@ -1492,7 +1492,7 @@
             throw new WebBeansConfigurationException("Producer method specialization is failed. Method " + method.getName() + " not found in super class : " + superClass.getName());
         }
         
-        if (!AnnotationUtil.isAnnotationExist(superMethod.getAnnotations(), Produces.class))
+        if (!AnnotationUtil.hasAnnotation(superMethod.getAnnotations(), Produces.class))
         {
             throw new WebBeansConfigurationException("Producer method specialization is failed. Method " + method.getName() + " found in super class : " + superClass.getName() + " is not annotated with @Produces");
         }
@@ -1525,7 +1525,7 @@
         
         String name = null;
         boolean hasName = false;
-        if(AnnotationUtil.isMethodHasAnnotation(superMethod, Named.class))
+        if(AnnotationUtil.hasMethodAnnotation(superMethod, Named.class))
         {
           Named named =  superMethod.getAnnotation(Named.class);
           hasName = true;
@@ -1554,7 +1554,7 @@
         
         if(hasName)
         {
-            if(AnnotationUtil.isMethodHasAnnotation(method, Named.class))
+            if(AnnotationUtil.hasMethodAnnotation(method, Named.class))
             {
                 throw new DefinitionException("Specialized method : " + method.getName() + " in class : " + component.getReturnType().getName() + " may not define @Named annotation");
             }
@@ -1574,7 +1574,7 @@
         Asserts.assertNotNull(method, "method parameter can not be null");
         Asserts.nullCheckForClass(clazz);
 
-        if (AnnotationUtil.isMethodParameterAnnotationExist(method, Disposes.class) || AnnotationUtil.isMethodParameterAnnotationExist(method, Observes.class))
+        if (AnnotationUtil.hasMethodParameterAnnotation(method, Disposes.class) || AnnotationUtil.hasMethodParameterAnnotation(method, Observes.class))
         {
             throw new WebBeansConfigurationException("Initializer method parameters in method : " + method.getName() + " in class : " + clazz.getName() + " can not be annotated with @Disposes or @Observers");
 
@@ -1896,7 +1896,7 @@
             
             if(!find.equals(component))
             {
-                if(AnnotationUtil.isAnnotationExistOnClass(find.getBeanClass(), Specializes.class))
+                if(AnnotationUtil.hasClassAnnotation(find.getBeanClass(), Specializes.class))
                 {
                     return getMostSpecializedBean(manager, find);
                 }                

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -271,7 +271,7 @@
                 }
                 else
                 {
-                    if (!XMLUtil.isElementChildExist(child, WebBeansConstants.WEB_BEANS_XML_STANDART_ELEMENT))
+                    if (!XMLUtil.hasChildElement(child, WebBeansConstants.WEB_BEANS_XML_STANDART_ELEMENT))
                     {
                         throw new DeploymentException("<Deploy> element must have <Standard/> deployment type in the web-beans.xml");
                     }
@@ -377,7 +377,7 @@
                 }
                 else
                 {
-                    if (!XMLUtil.isElementChildExist(child, WebBeansConstants.WEB_BEANS_XML_STANDART_ELEMENT))
+                    if (!XMLUtil.hasChildElement(child, WebBeansConstants.WEB_BEANS_XML_STANDART_ELEMENT))
                     {
                         throw new DeploymentException("<Deploy> element must have <Standard/> deployment type in the web-beans.xml");
                     }
@@ -485,7 +485,7 @@
             clazzAnnot = (Class<? extends Annotation>) clazz;
         }
 
-        if (xmlAnnotTypeManager.isBindingTypeExist(clazzAnnot))
+        if (xmlAnnotTypeManager.hasBindingType(clazzAnnot))
         {
             throw new DeploymentException(createConfigurationFailedMessage() + "Binding type with given class : " + bindingTypeElement.getName() + " is already defined in the XML");
         }
@@ -516,7 +516,7 @@
             clazzAnnot = (Class<? extends Annotation>) clazz;
         }
 
-        if (xmlAnnotTypeManager.isInterceptorBindingTypeExist(clazzAnnot))
+        if (xmlAnnotTypeManager.hasInterceptorBindingType(clazzAnnot))
         {
             throw new DeploymentException(createConfigurationFailedMessage() + "InterceptorBinding type with given class : " + interceptorBindingTypeElement.getName() + " is already defined in the XML");
         }
@@ -564,7 +564,7 @@
             clazzAnnot = (Class<? extends Annotation>) clazz;
         }
 
-        if (xmlAnnotTypeManager.isStereoTypeExist(clazzAnnot))
+        if (xmlAnnotTypeManager.hasStereoType(clazzAnnot))
         {
             throw new DeploymentException(createConfigurationFailedMessage() + "Stereotype with given class : " + stereoTypeElement.getName() + " is already defined in the XML");
         }
@@ -604,7 +604,7 @@
             }
             else
             {
-                if (!AnnotationUtil.isInterceptorBindingMetaAnnotationExist(clazz.getDeclaredAnnotations()))
+                if (!AnnotationUtil.hasInterceptorBindingMetaAnnotation(clazz.getDeclaredAnnotations()))
                 {
                     throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Interceptor class : " + XMLUtil.getName(child) + " must have at least one @InterceptorBindingType");
                 }
@@ -832,7 +832,7 @@
         XMLDefinitionUtil.checkSimpleWebBeansInXML(simpleClass, webBeanDecleration, createConfigurationFailedMessage());
 
         /* If interceptor, check this is enabled */
-        if (XMLUtil.isElementChildExistWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_ELEMENT))
+        if (XMLUtil.hasChildElementWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_ELEMENT))
         {
             if (!InterceptorsManager.getInstance().isInterceptorEnabled(simpleClass))
             {
@@ -841,7 +841,7 @@
         }
 
         /* If decorator, check this is enabled */
-        if (XMLUtil.isElementChildExistWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_DECORATOR_ELEMENT))
+        if (XMLUtil.hasChildElementWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_DECORATOR_ELEMENT))
         {
             if (!DecoratorsManager.getInstance().isDecoratorEnabled(simpleClass))
             {
@@ -1320,7 +1320,7 @@
      */
     private <T> void configureMethod(XMLManagedBean<T> component, Element child)
     {
-        if (!ClassUtil.isMethodExistWithName(component.getReturnType(), XMLUtil.getName(child)))
+        if (!ClassUtil.hasMethodWithName(component.getReturnType(), XMLUtil.getName(child)))
         {
             throw new NonexistentMethodException(createConfigurationFailedMessage() + "Method declaration with name " + XMLUtil.getName(child) + " is not found in the class : " + component.getReturnType().getName());
         }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java?rev=820150&r1=820149&r2=820150&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java Wed Sep 30 02:26:52 2009
@@ -58,7 +58,7 @@
         xmlResources.add(resource);
     }
 
-    public boolean isBindingTypeExist(Class<? extends Annotation> bindingType)
+    public boolean hasBindingType(Class<? extends Annotation> bindingType)
     {
         if (xmlBindingTypes.contains(bindingType))
         {
@@ -68,7 +68,7 @@
         return false;
     }
 
-    public boolean isResourceExist(Class<? extends Annotation> resource)
+    public boolean hasResource(Class<? extends Annotation> resource)
     {
         if (xmlResources.contains(resource))
         {
@@ -90,7 +90,7 @@
         xmlStereoTypes.add(stereoType);
     }
 
-    public boolean isStereoTypeExist(Class<? extends Annotation> stereoType)
+    public boolean hasStereoType(Class<? extends Annotation> stereoType)
     {
         if (xmlStereoTypes.contains(stereoType))
         {
@@ -115,7 +115,7 @@
         }
     }
 
-    public boolean isInterceptorBindingTypeExist(Class<? extends Annotation> bindingType)
+    public boolean hasInterceptorBindingType(Class<? extends Annotation> bindingType)
     {
         if (xmlInterceptorBindingTypes.keySet().contains(bindingType))
         {

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -99,7 +99,7 @@
 
         if (clazz.isAnnotationPresent(javax.interceptor.Interceptor.class))
         {
-            boolean found = XMLUtil.isElementChildExistWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_ELEMENT);
+            boolean found = XMLUtil.hasChildElementWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_ELEMENT);
             if (!found)
             {
                 throw new WebBeansConfigurationException(errorMessage + "Simple WebBeans component implementation class : " + clazz.getName() + " must be declared as <Interceptor> element in the XML");
@@ -108,7 +108,7 @@
 
         if (clazz.isAnnotationPresent(Decorator.class))
         {
-            boolean found = XMLUtil.isElementChildExistWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_DECORATOR_ELEMENT);
+            boolean found = XMLUtil.hasChildElementWithWebBeansNameSpace(webBeanDecleration, WebBeansConstants.WEB_BEANS_XML_DECORATOR_ELEMENT);
             if (!found)
             {
                 throw new WebBeansConfigurationException(errorMessage + "Simple WebBeans component implementation class : " + clazz.getName() + " must be declared as <Decorator> element in the XML");
@@ -201,7 +201,7 @@
                     Class<?> clazz = method.getReturnType();
                     if (clazz.isArray() || clazz.isAnnotation())
                     {
-                        if (!AnnotationUtil.isAnnotationExist(method.getAnnotations(), NonBinding.class))
+                        if (!AnnotationUtil.hasAnnotation(method.getAnnotations(), NonBinding.class))
                         {
                             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");
                         }
@@ -244,7 +244,7 @@
         stereoTypes = stereoTypesSet.toArray(stereoTypes);
         for (Annotation stero : stereoTypes)
         {
-            if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(stero.annotationType().getDeclaredAnnotations()))
+            if (AnnotationUtil.hasInterceptorBindingMetaAnnotation(stero.annotationType().getDeclaredAnnotations()))
             {
                 Annotation[] steroInterceptorBindings = AnnotationUtil.getInterceptorBindingMetaAnnotations(stero.annotationType().getDeclaredAnnotations());
 

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=820150&r1=820149&r2=820150&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 Wed Sep 30 02:26:52 2009
@@ -236,9 +236,9 @@
         if (!isElementInWebBeansNameSpaceWithName(element, WebBeansConstants.WEB_BEANS_XML_DEPLOY_ELEMENT) && 
                 !isElementInWebBeansNameSpaceWithName(element, WebBeansConstants.WEB_BEANS_XML_INTERCEPTORS_ELEMENT) && 
                 !isElementInWebBeansNameSpaceWithName(element, WebBeansConstants.WEB_BEANS_XML_DECORATORS_ELEMENT) && 
-                !isElementChildExist(element, WebBeansConstants.WEB_BEANS_XML_BINDING_TYPE) && 
-                !isElementChildExist(element, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_BINDING_TYPE) && 
-                !isElementChildExist(element, WebBeansConstants.WEB_BEANS_XML_STEREOTYPE))
+                !hasChildElement(element, WebBeansConstants.WEB_BEANS_XML_BINDING_TYPE) &&
+                !hasChildElement(element, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_BINDING_TYPE) &&
+                !hasChildElement(element, WebBeansConstants.WEB_BEANS_XML_STEREOTYPE))
         {
             return true;
         }
@@ -259,7 +259,7 @@
     {
         nullCheckForElement(element);
 
-        if (isElementChildExistWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_BINDING_TYPE))
+        if (hasChildElementWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_BINDING_TYPE))
         {
             return true;
         }
@@ -279,7 +279,7 @@
     {
         nullCheckForElement(element);
 
-        if (isElementChildExistWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_BINDING_TYPE))
+        if (hasChildElementWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_INTERCEPTOR_BINDING_TYPE))
         {
             return true;
         }
@@ -299,7 +299,7 @@
     {
         nullCheckForElement(element);
 
-        if (isElementChildExistWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_STEREOTYPE))
+        if (hasChildElementWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_STEREOTYPE))
         {
             return true;
         }
@@ -371,7 +371,7 @@
     public static boolean isElementHasDecoratesChild(Element element)
     {
         nullCheckForElement(element);
-        if (isElementChildExistWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_DECORATES_ELEMENT))
+        if (hasChildElementWithWebBeansNameSpace(element, WebBeansConstants.WEB_BEANS_XML_DECORATES_ELEMENT))
         {
             return true;
         }
@@ -522,7 +522,7 @@
         Asserts.nullCheckForDomElement(element);
     }
 
-    public static boolean isElementChildExist(Element parent, String childName)
+    public static boolean hasChildElement(Element parent, String childName)
     {
         Asserts.assertNotNull(parent, "parent parameter can not be null");
         Asserts.assertNotNull(childName, "childName parameter can not be null");
@@ -538,7 +538,7 @@
      * @return if child element exist within webbeans namespace with given child
      *         name
      */
-    public static boolean isElementChildExistWithWebBeansNameSpace(Element parent, String childName)
+    public static boolean hasChildElementWithWebBeansNameSpace(Element parent, String childName)
     {
         Asserts.assertNotNull(parent, "parent parameter can not be null");
         Asserts.assertNotNull(childName, "childName parameter can not be null");

Modified: incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java?rev=820150&r1=820149&r2=820150&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-tck/src/test/java/org/apache/webbeans/test/tck/BeansImpl.java Wed Sep 30 02:26:52 2009
@@ -54,7 +54,7 @@
 
     public boolean isEntityBean( Class<?> clazz ) 
     {
-        return (AnnotationUtil.isAnnotationExistOnClass(clazz, Entity.class));
+        return (AnnotationUtil.hasClassAnnotation(clazz, Entity.class));
     }        
 
     public boolean isProxy( Object instance ) {



Mime
View raw message