You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2013/01/06 11:16:36 UTC
svn commit: r1429491 - in /openwebbeans/trunk:
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/
webbeans-impl/src/main/java/org/apache/webbeans/component/
webbeans-impl/src/main/java/org/apache/webbeans/component/creation/
webbeans-impl/...
Author: arne
Date: Sun Jan 6 10:16:35 2013
New Revision: 1429491
URL: http://svn.apache.org/viewvc?rev=1429491&view=rev
Log:
OWB-745: Created ResourceBeanCreator and moved DefinitionUtil.defineQualifiers() to AbstractBeanCreator
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java Sun Jan 6 10:16:35 2013
@@ -83,7 +83,7 @@ public final class EjbUtility
ejbBeanCreator.defineApiType();
ejbBeanCreator.defineScopeType("Session Bean implementation class : " + clazz.getName() + " stereotypes must declare same @ScopeType annotations", false);
ejbBeanCreator.defineName(WebBeansUtil.getManagedBeanDefaultName(clazz.getSimpleName()));
- ejbBeanCreator.defineQualifier();
+ ejbBeanCreator.defineQualifiers();
Set<ProducerMethodBean<?>> producerMethodBeans = ejbBeanCreator.defineProducerMethods();
checkProducerMethods(producerMethodBeans, ejbBean);
Set<ProducerFieldBean<?>> producerFieldBeans = ejbBeanCreator.defineProducerFields();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java Sun Jan 6 10:16:35 2013
@@ -37,8 +37,6 @@ public class ResourceBean<X, T extends A
super(ownerBean, returnType);
this.resourceReference = resourceReference;
}
-
-
@Override
@SuppressWarnings("unchecked")
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java Sun Jan 6 10:16:35 2013
@@ -18,6 +18,8 @@
*/
package org.apache.webbeans.component.creation;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Iterator;
import java.util.List;
@@ -26,9 +28,18 @@ import java.util.Set;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.Nonbinding;
+import javax.inject.Named;
+import org.apache.webbeans.annotation.AnnotationManager;
+import org.apache.webbeans.annotation.AnyLiteral;
+import org.apache.webbeans.annotation.DefaultLiteral;
+import org.apache.webbeans.annotation.NamedLiteral;
import org.apache.webbeans.component.AbstractOwbBean;
+import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.config.DefinitionUtil;
+import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
+import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.util.AnnotationUtil;
/**
@@ -89,9 +100,95 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- public void defineQualifier()
+ public void defineQualifiers()
{
- definitionUtil.defineQualifiers(bean, AnnotationUtil.getAnnotationsFromSet(annotated.getAnnotations()));
+ Annotation[] annotations = AnnotationUtil.getAnnotationsFromSet(annotated.getAnnotations());
+ final AnnotationManager annotationManager = getBean().getWebBeansContext().getAnnotationManager();
+
+ for (Annotation annotation : annotations)
+ {
+ Class<? extends Annotation> type = annotation.annotationType();
+
+ if (annotationManager.isQualifierAnnotation(type))
+ {
+ Method[] methods = getBean().getWebBeansContext().getSecurityService().doPrivilegedGetDeclaredMethods(type);
+
+ for (Method method : methods)
+ {
+ Class<?> clazz = method.getReturnType();
+ if (clazz.isArray() || clazz.isAnnotation())
+ {
+ if (!AnnotationUtil.hasAnnotation(method.getDeclaredAnnotations(), Nonbinding.class))
+ {
+ throw new WebBeansConfigurationException("WebBeans definition class : " + getBean().getReturnType().getName() + " @Qualifier : "
+ + annotation.annotationType().getName()
+ + " must have @NonBinding valued members for its array-valued and annotation valued members");
+ }
+ }
+ }
+
+ if (annotation.annotationType().equals(Named.class) && getBean().getName() != null)
+ {
+ getBean().addQualifier(new NamedLiteral(getBean().getName()));
+ }
+ else
+ {
+ getBean().addQualifier(annotation);
+ }
+ }
+ }
+
+ // Adding inherited qualifiers
+ IBeanInheritedMetaData inheritedMetaData = null;
+
+ if(getBean() instanceof InjectionTargetBean)
+ {
+ inheritedMetaData = ((InjectionTargetBean<?>) getBean()).getInheritedMetaData();
+ }
+
+ if (inheritedMetaData != null)
+ {
+ Set<Annotation> inheritedTypes = inheritedMetaData.getInheritedQualifiers();
+ for (Annotation inherited : inheritedTypes)
+ {
+ Set<Annotation> qualifiers = getBean().getQualifiers();
+ boolean found = false;
+ for (Annotation existQualifier : qualifiers)
+ {
+ if (existQualifier.annotationType().equals(inherited.annotationType()))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ getBean().addQualifier(inherited);
+ }
+ }
+ }
+
+
+ // No-binding annotation
+ if (getBean().getQualifiers().size() == 0 )
+ {
+ getBean().addQualifier(new DefaultLiteral());
+ }
+ else if(getBean().getQualifiers().size() == 1)
+ {
+ Annotation annot = getBean().getQualifiers().iterator().next();
+ if(annot.annotationType().equals(Named.class))
+ {
+ getBean().addQualifier(new DefaultLiteral());
+ }
+ }
+
+ //Add @Any support
+ if(!AnnotationUtil.hasAnyQualifier(getBean()))
+ {
+ getBean().addQualifier(new AnyLiteral());
+ }
+
}
/**
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java Sun Jan 6 10:16:35 2013
@@ -369,10 +369,12 @@ public abstract class AbstractInjecionTa
throw new WebBeansConfigurationException("Resource producer annotated field : " + annotatedField + " can not define EL name");
}
- ResourceBean<T, Annotation> resourceBean = new ResourceBean<T, Annotation>((Class<T>)field.getType(), getBean(), resourceRef);
+ ResourceBeanCreator<T, Annotation> resourceBeanCreator
+ = new ResourceBeanCreator<T, Annotation>(getBean(), resourceRef, annotatedField);
+ ResourceBean<T, Annotation> resourceBean = resourceBeanCreator.getBean();
resourceBean.getTypes().addAll(annotatedField.getTypeClosure());
- definitionUtil.defineQualifiers(resourceBean, anns);
+ resourceBeanCreator.defineQualifiers();
resourceBean.setImplScopeType(new DependentScopeLiteral());
resourceBean.setProducerField(field);
@@ -381,7 +383,8 @@ public abstract class AbstractInjecionTa
}
else
{
- ProducerFieldBean<T> producerFieldBean = new ProducerFieldBean<T>(getBean(), (Class<T>)ClassUtil.getClass(annotatedField.getBaseType()));
+ ProducerFieldBeanCreator<T> producerFieldBeanCreator = new ProducerFieldBeanCreator<T>(getBean(), annotatedField);
+ ProducerFieldBean<T> producerFieldBean = producerFieldBeanCreator.getBean();
producerFieldBean.setProducerField(field);
if (producerFieldBean.getReturnType().isPrimitive())
@@ -406,7 +409,7 @@ public abstract class AbstractInjecionTa
webBeansContext.getWebBeansUtil().checkUnproxiableApiType(producerFieldBean,
producerFieldBean.getScope());
WebBeansUtil.checkProducerGenericType(producerFieldBean,annotatedField.getJavaMember());
- definitionUtil.defineQualifiers(producerFieldBean, anns);
+ producerFieldBeanCreator.defineQualifiers();
definitionUtil.defineName(producerFieldBean, anns, WebBeansUtil.getProducerDefaultName(annotatedField.getJavaMember().getName()));
producerBeans.add(producerFieldBean);
@@ -482,7 +485,7 @@ public abstract class AbstractInjecionTa
definitionUtil.defineName(producerMethodBean,
AnnotationUtil.getAnnotationsFromSet(annotatedMethod.getAnnotations()),
WebBeansUtil.getProducerDefaultName(annotatedMethod.getJavaMember().getName()));
- definitionUtil.defineQualifiers(producerMethodBean, AnnotationUtil.getAnnotationsFromSet(annotatedMethod.getAnnotations()));
+ producerMethodBeanCreator.defineQualifiers();
producerMethodBeanCreator.addMethodInjectionPointMetaData(annotatedMethod);
producerBeans.add(producerMethodBean);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanCreator.java Sun Jan 6 10:16:35 2013
@@ -66,7 +66,7 @@ public interface BeanCreator<T>
/**
* Defines qualifier.
*/
- public void defineQualifier();
+ public void defineQualifiers();
/**
* Gets bean.
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java Sun Jan 6 10:16:35 2013
@@ -158,7 +158,7 @@ public class ManagedBeanCreatorImpl<T> e
checkCreateConditions();
defineName(WebBeansUtil.getManagedBeanDefaultName(clazz.getSimpleName()));
- defineQualifier();
+ defineQualifiers();
if (managedBean.isFullInit())
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java Sun Jan 6 10:16:35 2013
@@ -18,16 +18,30 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.AnnotatedField;
+import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.ProducerFieldBean;
+import org.apache.webbeans.util.ClassUtil;
public class ProducerFieldBeanCreator<T> extends AbstractProducerBeanCreator<T>
{
- public ProducerFieldBeanCreator(ProducerFieldBean<T> bean, AnnotatedType<T> annotatedType)
+ public ProducerFieldBeanCreator(InjectionTargetBean<T> parent, AnnotatedField<? super T> annotatedField)
{
- super(bean, annotatedType);
+ super(new ProducerFieldBean<T>(parent, (Class<T>)ClassUtil.getClass(annotatedField.getBaseType())), annotatedField);
}
+ protected ProducerFieldBeanCreator(ProducerFieldBean<T> bean, AnnotatedField<? super T> annotatedField)
+ {
+ super(bean, annotatedField);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ProducerFieldBean<T> getBean()
+ {
+ return (ProducerFieldBean<T>) super.getBean();
+ }
}
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java?rev=1429491&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java Sun Jan 6 10:16:35 2013
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.component.creation;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+
+import org.apache.webbeans.component.InjectionTargetBean;
+import org.apache.webbeans.component.ResourceBean;
+import org.apache.webbeans.spi.api.ResourceReference;
+
+public class ResourceBeanCreator<T, R extends Annotation> extends ProducerFieldBeanCreator<T>
+{
+
+ public ResourceBeanCreator(InjectionTargetBean<T> parent, ResourceReference<T, R> resourceRef, AnnotatedField<? super T> annotatedField)
+ {
+ super(new ResourceBean<T, R>((Class<T>)annotatedField.getJavaMember().getType(), parent, resourceRef), annotatedField);
+ }
+
+ public ResourceBean<T, R> getBean()
+ {
+ return (ResourceBean<T, R>) super.getBean();
+ }
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Sun Jan 6 10:16:35 2013
@@ -21,22 +21,17 @@ package org.apache.webbeans.config;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.enterprise.context.NormalScope;
import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.Nonbinding;
import javax.inject.Named;
import javax.inject.Scope;
import org.apache.webbeans.annotation.AnnotationManager;
-import org.apache.webbeans.annotation.AnyLiteral;
-import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.annotation.NamedLiteral;
import org.apache.webbeans.component.AbstractInjectionTargetBean;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.EnterpriseBeanMarker;
@@ -68,102 +63,6 @@ public final class DefinitionUtil
}
/**
- * Configure web beans component qualifier.
- *
- * @param component configuring web beans component
- * @param annotations annotations
- */
- public <T> void defineQualifiers(AbstractOwbBean<T> component, Annotation[] annotations)
- {
- final AnnotationManager annotationManager = webBeansContext.getAnnotationManager();
-
- for (Annotation annotation : annotations)
- {
- Class<? extends Annotation> type = annotation.annotationType();
-
- if (annotationManager.isQualifierAnnotation(type))
- {
- Method[] methods = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethods(type);
-
- for (Method method : methods)
- {
- Class<?> clazz = method.getReturnType();
- if (clazz.isArray() || clazz.isAnnotation())
- {
- 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");
- }
- }
- }
-
- if (annotation.annotationType().equals(Named.class) && component.getName() != null)
- {
- component.addQualifier(new NamedLiteral(component.getName()));
- }
- else
- {
- component.addQualifier(annotation);
- }
- }
- }
-
- // Adding inherited qualifiers
- IBeanInheritedMetaData inheritedMetaData = null;
-
- if(component instanceof InjectionTargetBean)
- {
- inheritedMetaData = ((InjectionTargetBean<?>) component).getInheritedMetaData();
- }
-
- if (inheritedMetaData != null)
- {
- Set<Annotation> inheritedTypes = inheritedMetaData.getInheritedQualifiers();
- for (Annotation inherited : inheritedTypes)
- {
- Set<Annotation> qualifiers = component.getQualifiers();
- boolean found = false;
- for (Annotation existQualifier : qualifiers)
- {
- if (existQualifier.annotationType().equals(inherited.annotationType()))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- component.addQualifier(inherited);
- }
- }
- }
-
-
- // No-binding annotation
- if (component.getQualifiers().size() == 0 )
- {
- component.addQualifier(new DefaultLiteral());
- }
- else if(component.getQualifiers().size() == 1)
- {
- Annotation annot = component.getQualifiers().iterator().next();
- if(annot.annotationType().equals(Named.class))
- {
- component.addQualifier(new DefaultLiteral());
- }
- }
-
- //Add @Any support
- if(!AnnotationUtil.hasAnyQualifier(component))
- {
- component.addQualifier(new AnyLiteral());
- }
-
- }
-
- /**
* Configure web beans component scope type.
*
* @param <T> generic class type
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sun Jan 6 10:16:35 2013
@@ -2439,7 +2439,7 @@ public final class WebBeansUtil
setInjectionTargetBeanEnableFlag(managedBeanCreator.getBean());
managedBeanCreator.checkCreateConditions();
managedBeanCreator.defineName(WebBeansUtil.getManagedBeanDefaultName(clazz.getSimpleName()));
- managedBeanCreator.defineQualifier();
+ managedBeanCreator.defineQualifiers();
managedBeanCreator.defineConstructor();
managedBeanCreator.defineProducerMethods();
managedBeanCreator.defineProducerFields();
@@ -2584,7 +2584,7 @@ public final class WebBeansUtil
setInjectionTargetBeanEnableFlag(managedBeanCreator.getBean());
managedBeanCreator.checkCreateConditions();
managedBeanCreator.defineName(getManagedBeanDefaultName(clazz.getSimpleName()));
- managedBeanCreator.defineQualifier();
+ managedBeanCreator.defineQualifiers();
managedBeanCreator.defineConstructor();
managedBeanCreator.defineProducerMethods();
managedBeanCreator.defineProducerFields();
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=1429491&r1=1429490&r2=1429491&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Sun Jan 6 10:16:35 2013
@@ -544,7 +544,7 @@ public abstract class TestContext implem
WebBeansUtil.checkGenericType(component);
definitionUtil.defineName(component, clazzAnns, WebBeansUtil.getManagedBeanDefaultName(clazz.getSimpleName()));
- definitionUtil.defineQualifiers(component, clazzAnns);
+ managedBeanCreator.defineQualifiers();
Constructor<T> constructor = webBeansContext.getWebBeansUtil().defineConstructor(clazz);
component.setConstructor(constructor);