You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/07/04 08:20:38 UTC
svn commit: r791061 [3/4] - in
/incubator/openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/component/
main/java/org/apache/webbeans/component/third/
main/java/org/apache/webbeans/component/xml/
main/java/org/apache/webbeans/config/ m...
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=791061&r1=791060&r2=791061&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 Sat Jul 4 06:20:35 2009
@@ -52,12 +52,12 @@
import org.apache.webbeans.WebBeansConstants;
import org.apache.webbeans.annotation.CurrentLiteral;
import org.apache.webbeans.annotation.ProductionLiteral;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.xml.XMLComponentImpl;
-import org.apache.webbeans.component.xml.XMLProducerComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.xml.XMLManagedBean;
+import org.apache.webbeans.component.xml.XMLProducerBean;
import org.apache.webbeans.config.DefinitionUtil;
import org.apache.webbeans.config.SimpleWebBeansConfigurator;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.decorator.DecoratorsManager;
import org.apache.webbeans.deployment.DeploymentTypeManager;
import org.apache.webbeans.ejb.EJBUtil;
@@ -566,7 +566,7 @@
* @param simpleClass concrete java class defined in XML
* @param webBeanDecleration webbeans decleration root element
*/
- public <T> XMLComponentImpl<T> configureSimpleWebBean(Class<T> simpleClass, Element webBeanDecleration)
+ public <T> XMLManagedBean<T> configureSimpleWebBean(Class<T> simpleClass, Element webBeanDecleration)
{
/* Checking XML defined simple webbeans condition check. Spec : 3.2.4 */
XMLDefinitionUtil.checkSimpleWebBeansInXML(simpleClass, webBeanDecleration, createConfigurationFailedMessage());
@@ -590,7 +590,7 @@
}
/* Create new XML component with class name */
- XMLComponentImpl<T> component = new XMLComponentImpl<T>(simpleClass);
+ XMLManagedBean<T> component = new XMLManagedBean<T>(simpleClass);
/* Configures API type of the webbeans component */
DefinitionUtil.defineApiTypes(component, simpleClass);
@@ -607,7 +607,7 @@
/* Add to the manager */
else
{
- ManagerImpl.getManager().addBean(component);
+ BeanManagerImpl.getManager().addBean(component);
}
return component;
@@ -619,7 +619,7 @@
* @param component xml webbeans element
* @param webBeanDecleration webbeans element
*/
- private <T> void configureWebBeanDeclerationChilds(XMLComponentImpl<T> component, Element webBeanDecleration)
+ private <T> void configureWebBeanDeclerationChilds(XMLManagedBean<T> component, Element webBeanDecleration)
{
List<Element> childs = webBeanDecleration.elements();
Iterator<Element> it = childs.iterator();
@@ -751,7 +751,7 @@
* @param annotationSet type level annotation set
* @param webBeanDecleration webbeans decleration element
*/
- public <T> void configureTypeLevelMetaData(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
+ public <T> void configureTypeLevelMetaData(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
{
boolean isInterceptor = false;
boolean isDecorator = false;
@@ -812,7 +812,7 @@
* @param annotationSet type level annotation set
* @param webBeanDecleration webbeans decleration element
*/
- public <T> void configureProducerTypeLevelMetaData(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
+ public <T> void configureProducerTypeLevelMetaData(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
{
configureBindingType(component, annotationSet, annotationElementList);
@@ -840,7 +840,7 @@
* @throws DefinitionException if more than one constructor exists
* @throws NonexistentConstructorException if no constructor exists
*/
- private <T> void configureConstructorMetaData(XMLComponentImpl<T> component, List<Class<?>> typeList, List<Element> constructorParameterListElement)
+ private <T> void configureConstructorMetaData(XMLManagedBean<T> component, List<Class<?>> typeList, List<Element> constructorParameterListElement)
{
Class<T> implClazz = component.getReturnType();
Constructor<T> cons[] = ClassUtil.getConstructors(implClazz);
@@ -929,7 +929,7 @@
* @param component xml webbeans component
* @param child field or method child element
*/
- private <T> void configureFieldOrMethodMetaData(XMLComponentImpl<T> component, Element child)
+ private <T> void configureFieldOrMethodMetaData(XMLManagedBean<T> component, Element child)
{
if (XMLUtil.isElementField(child))
{
@@ -953,7 +953,7 @@
* @throws DefinitionException if contains more than one <valuegt;
* element childs
*/
- private <T> void configureField(XMLComponentImpl<T> component, Element child)
+ private <T> void configureField(XMLManagedBean<T> component, Element child)
{
Class<?> clazz = component.getReturnType();
@@ -1058,7 +1058,7 @@
* @throws DefinitionException if any other configuration related exception
* occurs.
*/
- private <T> void configureMethod(XMLComponentImpl<T> component, Element child)
+ private <T> void configureMethod(XMLManagedBean<T> component, Element child)
{
if (!ClassUtil.isMethodExistWithName(component.getReturnType(), XMLUtil.getName(child)))
{
@@ -1186,7 +1186,7 @@
* @param annotChild element child
* @param type type of the configuration method
*/
- private <T> void configureMethodAnnotationType(XMLComponentImpl<T> component, Method annotatedMethod, Element annotChild, int type, List<Element> methodParameterElements)
+ private <T> void configureMethodAnnotationType(XMLManagedBean<T> component, Method annotatedMethod, Element annotChild, int type, List<Element> methodParameterElements)
{
switch (type)
{
@@ -1220,7 +1220,7 @@
* @param initializeMethod initialize method of the webbeans component
* @param annotChild element child
*/
- private <T> void configureMethodInitializeAnnotation(XMLComponentImpl<T> component, Method initializeMethod, List<Element> methodParameterElements)
+ private <T> void configureMethodInitializeAnnotation(XMLManagedBean<T> component, Method initializeMethod, List<Element> methodParameterElements)
{
if (methodParameterElements.isEmpty())
{
@@ -1238,24 +1238,24 @@
}
}
- private <T> void configureMethodProducesAnnotation(XMLComponentImpl<T> component, Method producesMethod, Element annotChild)
+ private <T> void configureMethodProducesAnnotation(XMLManagedBean<T> component, Method producesMethod, Element annotChild)
{
- XMLProducerComponentImpl<T> producer = XMLDefinitionUtil.defineXMLProducerMethod(this, component, producesMethod, annotChild, createConfigurationFailedMessage());
- ManagerImpl.getManager().addBean(producer);
+ XMLProducerBean<T> producer = XMLDefinitionUtil.defineXMLProducerMethod(this, component, producesMethod, annotChild, createConfigurationFailedMessage());
+ BeanManagerImpl.getManager().addBean(producer);
}
- private <T> void configureMethodDisposesAnnotation(XMLComponentImpl<T> component, Method disposalMethod, Element annotChild)
+ private <T> void configureMethodDisposesAnnotation(XMLManagedBean<T> component, Method disposalMethod, Element annotChild)
{
XMLDefinitionUtil.defineXMLDisposalMethod(component, disposalMethod, annotChild, createConfigurationFailedMessage());
}
- private <T> void configureMethodObservesAnnotation(XMLComponentImpl<T> component, Method observesMethod, Element annotChild)
+ private <T> void configureMethodObservesAnnotation(XMLManagedBean<T> component, Method observesMethod, Element annotChild)
{
XMLDefinitionUtil.defineXMLObservesMethod(component, observesMethod, annotChild, createConfigurationFailedMessage());
}
- private <T> void configureMethodInterceptorBindingTypeAnnotation(XMLComponentImpl<T> component, Method interceptorMethod, Element annotChild)
+ private <T> void configureMethodInterceptorBindingTypeAnnotation(XMLManagedBean<T> component, Method interceptorMethod, Element annotChild)
{
XMLDefinitionUtil.defineXMLMethodLevelInterceptorType(component, interceptorMethod, annotChild, createConfigurationFailedMessage());
}
@@ -1271,7 +1271,7 @@
* @throws DefinitionException if more than one method satisfies the
* conditions
*/
- private <T> Method checkConfigureMethodConditions(XMLComponentImpl<T> component, Element child, List<Class<?>> methodParameters)
+ private <T> Method checkConfigureMethodConditions(XMLManagedBean<T> component, Element child, List<Class<?>> methodParameters)
{
// Check with name and also parameter types
List<Method> definedMethods = ClassUtil.getClassMethodsWithTypes(component.getReturnType(), XMLUtil.getName(child), methodParameters);
@@ -1297,7 +1297,7 @@
* @throws DefinitionException if disposes element can not contain exactly
* one child element
*/
- private <T> void checkConfigureDisposes(AbstractComponent<T> component, Element disposes)
+ private <T> void checkConfigureDisposes(AbstractBean<T> component, Element disposes)
{
List<Element> disposesChilds = disposes.elements();
@@ -1319,7 +1319,7 @@
* AfterTransactionFailure, BeforeTransactionCompletion}
* element.
*/
- private <T> void checkConfigureObserves(AbstractComponent<T> component, Element observes)
+ private <T> void checkConfigureObserves(AbstractBean<T> component, Element observes)
{
List<Element> observesChilds = observes.elements();
@@ -1346,7 +1346,7 @@
* @param component xml defined web beans component
* @param annotationSet all annotation defined in XML
*/
- private <T> void configureDeploymentType(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+ private <T> void configureDeploymentType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
{
Class<? extends Annotation> deploymentType = XMLDefinitionUtil.defineXMLTypeMetaData(component, annotationSet, DeploymentType.class, createConfigurationFailedMessage() + "@DeploymentType annotation is not configured correctly for class : " + component.getReturnType().getName());
@@ -1378,7 +1378,7 @@
* @param component xml defined web beans component
* @param annotationSet all annotation defined in XML
*/
- private <T> void configureScopeType(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+ private <T> void configureScopeType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
{
Class<? extends Annotation> scopeType = XMLDefinitionUtil.defineXMLTypeMetaData(component, annotationSet, ScopeType.class, createConfigurationFailedMessage() + "@ScopeType annotation is not configured correctly");
@@ -1400,7 +1400,7 @@
* @param component web beans xml component
* @param anns annotations defined in the xml documents
*/
- private <T> void configureBindingType(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+ private <T> void configureBindingType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
{
boolean isDefined = XMLDefinitionUtil.defineXMLBindingType(component, annotationSet, annotationElementList, createConfigurationFailedMessage());
@@ -1417,7 +1417,7 @@
* @param component web beans xml component
* @param anns annotations defined in the xml documents
*/
- private <T> void configureInterceptorBindingType(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+ private <T> void configureInterceptorBindingType(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
{
XMLDefinitionUtil.defineXMLClassLevelInterceptorType(component, annotationSet, annotationElementList, createConfigurationFailedMessage());
}
@@ -1428,7 +1428,7 @@
* @param component webbeans component
* @param annotationSet type-level metadata annotation set
*/
- private <T> void configureStereoType(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+ private <T> void configureStereoType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
{
XMLDefinitionUtil.defineXMLStereoType(component, annotationSet);
}
@@ -1440,7 +1440,7 @@
* @param annotationSet type-level metadata annotation set
* @param webBeanDecleration webbeans decleration element
*/
- private <T> void configureNamed(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, Element webBeanDecleration)
+ private <T> void configureNamed(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, Element webBeanDecleration)
{
boolean isDefined = XMLDefinitionUtil.defineXMLName(component, annotationSet);
if (isDefined)
@@ -1469,7 +1469,7 @@
* @param component webbeans component
* @param annotationSet type-level metadata annotation set
*/
- private <T> void configureSpecializes(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet)
+ private <T> void configureSpecializes(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet)
{
XMLDefinitionUtil.defineXMLSpecializes(component, annotationSet);
}
@@ -1480,7 +1480,7 @@
* @param component webbeans component
* @param annotationSet type-level metadata annotation set
*/
- private <T> void configureInterceptor(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+ private <T> void configureInterceptor(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
{
XMLDefinitionUtil.defineXMLInterceptors(component, annotationSet, annotationElementList, createConfigurationFailedMessage());
@@ -1492,7 +1492,7 @@
* @param component webbeans component
* @param annotationSet type-level metadata annotation set
*/
- private <T> void configureDecorator(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
+ private <T> void configureDecorator(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
{
XMLDefinitionUtil.defineXMLDecorators(component, annotationSet, webBeanDecleration, createConfigurationFailedMessage());
}
@@ -1575,7 +1575,7 @@
* @param child child element that declares field
* @param isValueElement is it applicable for value setting
*/
- private <T> void configureFieldValues(XMLComponentImpl<T> component, Field field, Element child, boolean isValueElement)
+ private <T> void configureFieldValues(XMLManagedBean<T> component, Field field, Element child, boolean isValueElement)
{
if (isValueElement)
{
@@ -1728,7 +1728,7 @@
* @param child list field xml element
* @param errorMessage error message
*/
- private void configureFieldListValue(XMLComponentImpl<?> component, Field field, Element child, String errorMessage)
+ private void configureFieldListValue(XMLManagedBean<?> component, Field field, Element child, String errorMessage)
{
boolean isString = false;
boolean isEnum = false;
@@ -1823,7 +1823,7 @@
* @param child list field xml element
* @param errorMessage error message
*/
- private void configureFieldSetValue(XMLComponentImpl<?> component, Field field, Element child, String errorMessage)
+ private void configureFieldSetValue(XMLManagedBean<?> component, Field field, Element child, String errorMessage)
{
boolean isString = false;
boolean isEnum = false;
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=791061&r1=791060&r2=791061&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 Sat Jul 4 06:20:35 2009
@@ -37,9 +37,9 @@
import javax.interceptor.AroundInvoke;
import org.apache.webbeans.WebBeansConstants;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.xml.XMLComponentImpl;
-import org.apache.webbeans.component.xml.XMLProducerComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.xml.XMLManagedBean;
+import org.apache.webbeans.component.xml.XMLProducerBean;
import org.apache.webbeans.container.InjectionResolver;
import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
import org.apache.webbeans.event.NotificationManager;
@@ -148,7 +148,7 @@
* @return applicable annotation class for given defineType parameter from
* the given set
*/
- public static <T> Class<? extends Annotation> defineXMLTypeMetaData(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, Class<? extends Annotation> defineType, String errorMessage)
+ public static <T> Class<? extends Annotation> defineXMLTypeMetaData(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, Class<? extends Annotation> defineType, String errorMessage)
{
// Found annotation for given defineType parameter
Class<? extends Annotation> metaType = null;
@@ -175,7 +175,7 @@
return metaType;
}
- public static <T> boolean defineXMLBindingType(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
+ public static <T> boolean defineXMLBindingType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
{
Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
boolean found = false;
@@ -213,7 +213,7 @@
return found;
}
- public static <T> void defineXMLClassLevelInterceptorType(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
+ public static <T> void defineXMLClassLevelInterceptorType(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
{
Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
@@ -255,7 +255,7 @@
}
- public static <T> void defineXMLMethodLevelInterceptorType(XMLComponentImpl<T> component, Method interceptorMethod, Element interceptorMethodElement, String errorMessage)
+ public static <T> void defineXMLMethodLevelInterceptorType(XMLManagedBean<T> component, Method interceptorMethod, Element interceptorMethodElement, String errorMessage)
{
List<Element> bindingTypes = interceptorMethodElement.elements();
Set<Annotation> bindingTypesSet = new HashSet<Annotation>();
@@ -291,7 +291,7 @@
* @param component webbeans component
* @param annotationSet set of type-level metadata annotation set
*/
- public static <T> void defineXMLStereoType(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet)
+ public static <T> void defineXMLStereoType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet)
{
Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
while (it.hasNext())
@@ -304,7 +304,7 @@
}
}
- public static <T> boolean defineXMLName(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet)
+ public static <T> boolean defineXMLName(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet)
{
Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
while (it.hasNext())
@@ -319,7 +319,7 @@
return false;
}
- public static <T> void defineXMLSpecializes(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet)
+ public static <T> void defineXMLSpecializes(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet)
{
Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
while (it.hasNext())
@@ -332,7 +332,7 @@
}
}
- public static <T> void defineXMLInterceptors(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
+ public static <T> void defineXMLInterceptors(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
{
Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
boolean found = false;
@@ -372,10 +372,10 @@
anns = interceptorBindingTypes.toArray(anns);
InterceptorUtil.checkLifecycleConditions(component.getReturnType(), anns, errorMessage + "Lifecycle interceptor : " + component.getReturnType().getName() + " interceptor binding type must be defined as @Target{TYPE}");
- WebBeansInterceptorConfig.configureInterceptorClass((XMLComponentImpl<Object>) component, anns);
+ WebBeansInterceptorConfig.configureInterceptorClass((XMLManagedBean<Object>) component, anns);
}
- public static <T> void defineXMLDecorators(XMLComponentImpl<T> component, List<Class<? extends Annotation>> annotationSet, Element decoratorDecleration, String errorMessage)
+ public static <T> void defineXMLDecorators(XMLManagedBean<T> component, List<Class<? extends Annotation>> annotationSet, Element decoratorDecleration, String errorMessage)
{
Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
boolean found = false;
@@ -420,7 +420,7 @@
XMLInjectionPointModel model = XMLUtil.getInjectionPointModel(type, errorMessage);
- WebBeansDecoratorConfig.configureXMLDecoratorClass((AbstractComponent<Object>) component, model);
+ WebBeansDecoratorConfig.configureXMLDecoratorClass((AbstractBean<Object>) component, model);
}
else
{
@@ -438,9 +438,9 @@
* @param producerMethodElement produce method xml element
* @param errorMessage error message
* @return newly created and configures xml webbeans producer component.
- * @see XMLProducerComponentImpl
+ * @see XMLProducerBean
*/
- public static <T> XMLProducerComponentImpl<T> defineXMLProducerMethod(WebBeansXMLConfigurator configurator, XMLComponentImpl<T> component, Method producesMethod, Element producerMethodElement, String errorMessage)
+ public static <T> XMLProducerBean<T> defineXMLProducerMethod(WebBeansXMLConfigurator configurator, XMLManagedBean<T> component, Method producesMethod, Element producerMethodElement, String errorMessage)
{
boolean producesDefined = false;
List<Element> childElements = producerMethodElement.elements();
@@ -520,7 +520,7 @@
}
}
- XMLProducerComponentImpl<T> producerComponentImpl = configureProducerMethod(component, producesMethod, injectedParameters, type, arrayElement, typeElement, errorMessage);
+ XMLProducerBean<T> producerComponentImpl = configureProducerMethod(component, producesMethod, injectedParameters, type, arrayElement, typeElement, errorMessage);
configureProducerTypeLevelMetaData(configurator, producerComponentImpl, producesMethod, producerMethodElement, memberLevelMetaData, memberLevelElement, component, errorMessage);
@@ -542,12 +542,12 @@
* the Java type element
* @param errorMessage error message
* @return new xml defines producer method component
- * @see XMLProducerComponentImpl
+ * @see XMLProducerBean
*/
- private static <T> XMLProducerComponentImpl<T> configureProducerMethod(AbstractComponent<?> parentComponent, Method producesMethod, List<XMLInjectionPointModel> injectedParameters, Class<T> type, Element arrayElement, Element typeElement, String errorMessage)
+ private static <T> XMLProducerBean<T> configureProducerMethod(AbstractBean<?> parentComponent, Method producesMethod, List<XMLInjectionPointModel> injectedParameters, Class<T> type, Element arrayElement, Element typeElement, String errorMessage)
{
/* New producer webbeans component */
- XMLProducerComponentImpl<T> producerComponentImpl = new XMLProducerComponentImpl<T>(parentComponent, type);
+ XMLProducerBean<T> producerComponentImpl = new XMLProducerBean<T>(parentComponent, type);
/* Check return type is the array type */
if (arrayElement != null)
@@ -597,9 +597,9 @@
* @param component parent component that defines producer method
* @param errorMessage error message
* @return type level metadata configured webbeans
- * @see XMLProducerComponentImpl
+ * @see XMLProducerBean
*/
- private static <T> XMLProducerComponentImpl<T> configureProducerTypeLevelMetaData(WebBeansXMLConfigurator configurator, XMLProducerComponentImpl<T> producerComponentImpl, Method producesMethod, Element producerMethodElement, List<Class<? extends Annotation>> memberLevelMetaData, List<Element> memberLevelElement, XMLComponentImpl<T> component, String errorMessage)
+ private static <T> XMLProducerBean<T> configureProducerTypeLevelMetaData(WebBeansXMLConfigurator configurator, XMLProducerBean<T> producerComponentImpl, Method producesMethod, Element producerMethodElement, List<Class<? extends Annotation>> memberLevelMetaData, List<Element> memberLevelElement, XMLManagedBean<T> component, String errorMessage)
{
for (Class<? extends Annotation> memberLevelMetaDataClass : memberLevelMetaData)
@@ -628,7 +628,7 @@
* @throws UnsatisfiedResolutionException if no producer method found for
* given disposal method
*/
- public static <T> void defineXMLDisposalMethod(XMLComponentImpl<T> component, Method disposalMethod, Element disposalMethodElement, String errorMessage)
+ public static <T> void defineXMLDisposalMethod(XMLManagedBean<T> component, Method disposalMethod, Element disposalMethodElement, String errorMessage)
{
/* Disposal method element childs */
List<Element> disposalChildElements = disposalMethodElement.elements();
@@ -639,7 +639,7 @@
/* Other parameter elements other than @Disposes */
List<Element> otherParameterElements = new ArrayList<Element>();
- XMLProducerComponentImpl<?> producerComponent = null;
+ XMLProducerBean<?> producerComponent = null;
for (Element childElement : disposalChildElements)
{
@@ -667,7 +667,7 @@
bindingAnns = bindingTypes.toArray(bindingAnns);
Set<Bean<?>> set = InjectionResolver.getInstance().implResolveByType(model.getInjectionGenericType(), bindingAnns);
- producerComponent = (XMLProducerComponentImpl<?>) set.iterator().next();
+ producerComponent = (XMLProducerBean<?>) set.iterator().next();
if (producerComponent == null)
{
@@ -692,7 +692,7 @@
}
}
- public static <T, K> void defineXMLObservesMethod(XMLComponentImpl<T> component, Method observesMethod, Element observesMethodElement, String errorMessage)
+ public static <T, K> void defineXMLObservesMethod(XMLManagedBean<T> component, Method observesMethod, Element observesMethodElement, String errorMessage)
{
component.addObservableMethod(observesMethod);
@@ -744,7 +744,7 @@
}
}
- public static InjectionPoint getXMLMethodInjectionPoint(AbstractComponent<?> component, XMLInjectionPointModel model, Method method)
+ public static InjectionPoint getXMLMethodInjectionPoint(AbstractBean<?> component, XMLInjectionPointModel model, Method method)
{
Asserts.assertNotNull(model,"model parameter can not be null");
Asserts.assertNotNull(method,"method parameter can not be null");
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=791061&r1=791060&r2=791061&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 Sat Jul 4 06:20:35 2009
@@ -31,7 +31,7 @@
import org.apache.webbeans.WebBeansConstants;
import org.apache.webbeans.annotation.CurrentLiteral;
import org.apache.webbeans.annotation.WebBeansAnnotation;
-import org.apache.webbeans.component.xml.XMLProducerComponentImpl;
+import org.apache.webbeans.component.xml.XMLProducerBean;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.exception.definition.NonexistentTypeException;
@@ -883,7 +883,7 @@
return model;
}
- public static <T> void defineXMLProducerApiTypeFromArrayElement(XMLProducerComponentImpl<T> component, Element typeElement, String errorMessage)
+ public static <T> void defineXMLProducerApiTypeFromArrayElement(XMLProducerBean<T> component, Element typeElement, String errorMessage)
{
List<Element> childElements = typeElement.elements();
boolean isElementTypeDefined = false;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java Sat Jul 4 06:20:35 2009
@@ -15,7 +15,7 @@
import javax.servlet.ServletContext;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.test.annotation.binding.AnnotationWithBindingMember;
import org.apache.webbeans.test.annotation.binding.AnnotationWithNonBindingMember;
import org.apache.webbeans.test.component.BindingComponent;
@@ -37,7 +37,7 @@
public @AnnotationWithNonBindingMember(value = "C", arg1 = "arg11", arg2 = "arg21")
NonBindingComponent s5 = null;
- private static ManagerImpl cont = ManagerImpl.getManager();
+ private static BeanManagerImpl cont = BeanManagerImpl.getManager();
private static final String CLAZZ_NAME = ComponentResolutionByTypeTest.class.getName();
public ComponentResolutionByTypeTest()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java Sat Jul 4 06:20:35 2009
@@ -31,23 +31,25 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ObserverMethod;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.container.activity.ActivityManager;
public class MockManager implements BeanManager
{
- private ManagerImpl manager = null;
+ private BeanManagerImpl manager = null;
- private List<AbstractComponent<?>> componentList = new ArrayList<AbstractComponent<?>>();
+ private List<AbstractBean<?>> componentList = new ArrayList<AbstractBean<?>>();
public MockManager()
{
- this.manager = new ManagerImpl();
+ this.manager = new BeanManagerImpl();
ActivityManager.getInstance().setRootActivity(this.manager);
}
@@ -56,17 +58,17 @@
{
componentList.clear();
- this.manager = new ManagerImpl();
+ this.manager = new BeanManagerImpl();
ActivityManager.getInstance().setRootActivity(this.manager);
}
- public List<AbstractComponent<?>> getComponents()
+ public List<AbstractBean<?>> getComponents()
{
return componentList;
}
- public AbstractComponent<?> getComponent(int i)
+ public AbstractBean<?> getComponent(int i)
{
return componentList.get(i);
}
@@ -334,4 +336,18 @@
this.manager.validate(injectionPoint);
}
+
+
+ @Override
+ public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type)
+ {
+ return this.manager.createInjectionTarget(type);
+ }
+
+
+ @Override
+ public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, Annotation... bindings)
+ {
+ return this.manager.resolveObserverMethods(event, bindings);
+ }
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java Sat Jul 4 06:20:35 2009
@@ -36,10 +36,10 @@
import junit.framework.Assert;
import org.apache.log4j.Logger;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.WebBeansType;
-import org.apache.webbeans.component.xml.XMLComponentImpl;
+import org.apache.webbeans.component.xml.XMLManagedBean;
import org.apache.webbeans.config.SimpleWebBeansConfigurator;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.context.DependentContext;
@@ -310,9 +310,9 @@
* @param clazz simple webbeans class
* @return simple webbean
*/
- protected <T> AbstractComponent<T> defineSimpleWebBean(Class<T> clazz)
+ protected <T> AbstractBean<T> defineSimpleWebBean(Class<T> clazz)
{
- ComponentImpl<T> bean = null;
+ ManagedBean<T> bean = null;
bean = SimpleWebBeansConfigurator.define(clazz, WebBeansType.SIMPLE);
@@ -322,7 +322,7 @@
DecoratorUtil.checkSimpleWebBeanDecoratorConditions(bean);
// DefinitionUtil.defineSimpleWebBeanInterceptorStack(bean);
- getComponents().add((AbstractComponent<?>) bean);
+ getComponents().add((AbstractBean<?>) bean);
manager.addBean(bean);
}
@@ -335,9 +335,9 @@
* @param simpleClass webbeans class
* @param webBeanDecleration element decleration defines simple webbeans
*/
- protected <T> XMLComponentImpl<T> defineXMLSimpleWebBeans(Class<T> simpleClass, Element webBeanDecleration)
+ protected <T> XMLManagedBean<T> defineXMLSimpleWebBeans(Class<T> simpleClass, Element webBeanDecleration)
{
- XMLComponentImpl<T> bean = null;
+ XMLManagedBean<T> bean = null;
bean = this.xmlConfigurator.configureSimpleWebBean(simpleClass, webBeanDecleration);
if (bean != null)
@@ -358,7 +358,7 @@
* @param xmlResourcePath
* @return XMLComponentImpl<?> with the WebBean definition
*/
- protected XMLComponentImpl<?> getWebBeanFromXml(String xmlResourcePath)
+ protected XMLManagedBean<?> getWebBeanFromXml(String xmlResourcePath)
{
InputStream stream = XMLTest.class.getClassLoader().getResourceAsStream(xmlResourcePath);
Assert.assertNotNull(stream);
@@ -368,7 +368,7 @@
Class<?> clazz = XMLUtil.getElementJavaType(beanElement);
- XMLComponentImpl<?> def = defineXMLSimpleWebBeans(clazz, beanElement);
+ XMLManagedBean<?> def = defineXMLSimpleWebBeans(clazz, beanElement);
return def;
}
@@ -383,7 +383,7 @@
* @return XMLComponentImpl<?> with the WebBean definition
*/
@SuppressWarnings("unchecked")
- protected AbstractComponent<?> getWebBeanFromXml(String xmlResourcePath, Class<?> desiredClazz)
+ protected AbstractBean<?> getWebBeanFromXml(String xmlResourcePath, Class<?> desiredClazz)
{
InputStream stream = XMLTest.class.getClassLoader().getResourceAsStream(xmlResourcePath);
Assert.assertNotNull(stream);
@@ -397,7 +397,7 @@
defineXMLSimpleWebBeans(clazz, beanElement);
}
- for (AbstractComponent<?> def : getComponents())
+ for (AbstractBean<?> def : getComponents())
{
if (def.getReturnType().equals(desiredClazz))
{
@@ -415,9 +415,9 @@
* @return the new interceptor
*/
@SuppressWarnings("unchecked")
- protected <T> AbstractComponent<T> defineSimpleWebBeanInterceptor(Class<T> clazz)
+ protected <T> AbstractBean<T> defineSimpleWebBeanInterceptor(Class<T> clazz)
{
- ComponentImpl<T> component = null;
+ ManagedBean<T> component = null;
SimpleWebBeansConfigurator.checkSimpleWebBeanCondition(clazz);
{
@@ -426,7 +426,7 @@
{
InterceptorUtil.checkInterceptorConditions(clazz);
component = SimpleWebBeansConfigurator.define(clazz, WebBeansType.INTERCEPTOR);
- WebBeansInterceptorConfig.configureInterceptorClass((ComponentImpl<Object>) component, clazz.getDeclaredAnnotations());
+ WebBeansInterceptorConfig.configureInterceptorClass((ManagedBean<Object>) component, clazz.getDeclaredAnnotations());
}
}
@@ -441,9 +441,9 @@
* @return the new decorator
*/
@SuppressWarnings("unchecked")
- protected <T> AbstractComponent<T> defineSimpleWebBeansDecorators(Class<T> clazz)
+ protected <T> AbstractBean<T> defineSimpleWebBeansDecorators(Class<T> clazz)
{
- ComponentImpl<T> component = null;
+ ManagedBean<T> component = null;
if (DecoratorsManager.getInstance().isDecoratorEnabled(clazz))
{
@@ -452,7 +452,7 @@
if (component != null)
{
- WebBeansDecoratorConfig.configureDecoratorClass((ComponentImpl<Object>) component);
+ WebBeansDecoratorConfig.configureDecoratorClass((ManagedBean<Object>) component);
}
}
@@ -474,7 +474,7 @@
* @param i ith component in the {@link MockManager}
* @return the ith component in the list
*/
- protected AbstractComponent<?> getComponent(int i)
+ protected AbstractBean<?> getComponent(int i)
{
return manager.getComponent(i);
}
@@ -484,7 +484,7 @@
*
* @return all components
*/
- protected List<AbstractComponent<?>> getComponents()
+ protected List<AbstractBean<?>> getComponents()
{
return manager.getComponents();
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java Sat Jul 4 06:20:35 2009
@@ -19,7 +19,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.ContaintsCurrentComponent;
import org.apache.webbeans.test.component.CurrentBindingComponent;
@@ -51,7 +51,7 @@
defineSimpleWebBean(Typed2.class);
defineSimpleWebBean(CurrentBindingComponent.class);
defineSimpleWebBean(ContaintsCurrentComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java Sat Jul 4 06:20:35 2009
@@ -19,8 +19,8 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.DisposalMethodComponent;
import org.apache.webbeans.test.component.service.IService;
@@ -41,7 +41,7 @@
@Before
public void init()
{
- this.container = ManagerImpl.getManager();
+ this.container = BeanManagerImpl.getManager();
super.init();
}
@@ -53,7 +53,7 @@
defineSimpleWebBean(ServiceImpl1.class);
defineSimpleWebBean(DisposalMethodComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
ContextFactory.initApplicationContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java Sat Jul 4 06:20:35 2009
@@ -17,7 +17,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.service.InjectedComponent;
import org.apache.webbeans.test.component.service.ServiceImpl1;
@@ -46,7 +46,7 @@
defineSimpleWebBean(InjectedComponent.class);
defineSimpleWebBean(ServiceImpl1.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
ContextFactory.initApplicationContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java Sat Jul 4 06:20:35 2009
@@ -20,8 +20,8 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.BindingComponent;
import org.apache.webbeans.test.component.NonBindingComponent;
@@ -42,7 +42,7 @@
public void init()
{
super.init();
- this.container = ManagerImpl.getManager();
+ this.container = BeanManagerImpl.getManager();
}
@Test
@@ -51,7 +51,7 @@
clear();
defineSimpleWebBean(BindingComponent.class);
defineSimpleWebBean(NonBindingComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
ContextFactory.initSessionContext(session);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java Sat Jul 4 06:20:35 2009
@@ -19,7 +19,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.CheckWithCheckPayment;
import org.apache.webbeans.test.component.CheckWithMoneyPayment;
@@ -53,7 +53,7 @@
defineSimpleWebBean(CheckWithMoneyPayment.class);
defineSimpleWebBean(PaymentProcessorComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java Sat Jul 4 06:20:35 2009
@@ -19,8 +19,8 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.intercept.InterceptorData;
import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -52,7 +52,7 @@
defineSimpleWebBean(CheckWithCheckPayment.class);
defineSimpleWebBean(PostConstructComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
@@ -68,7 +68,7 @@
pcc.getP();
- ComponentImpl<PostConstructComponent> s = (ComponentImpl<PostConstructComponent>) comps.get(1);
+ ManagedBean<PostConstructComponent> s = (ManagedBean<PostConstructComponent>) comps.get(1);
List<InterceptorData> stack = s.getInterceptorStack();
Assert.assertEquals(1, stack.size());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java Sat Jul 4 06:20:35 2009
@@ -19,9 +19,9 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.intercept.InterceptorData;
import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -42,7 +42,7 @@
@Before
public void init()
{
- this.container = ManagerImpl.getManager();
+ this.container = BeanManagerImpl.getManager();
super.init();
}
@@ -54,7 +54,7 @@
defineSimpleWebBean(CheckWithCheckPayment.class);
defineSimpleWebBean(PreDestroyComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
@@ -70,7 +70,7 @@
PreDestroyComponent pcc = (PreDestroyComponent) object2;
- ComponentImpl<PreDestroyComponent> s = (ComponentImpl<PreDestroyComponent>) comps.get(1);
+ ManagedBean<PreDestroyComponent> s = (ManagedBean<PreDestroyComponent>) comps.get(1);
List<InterceptorData> stack = s.getInterceptorStack();
Assert.assertEquals(2, stack.size());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java Sat Jul 4 06:20:35 2009
@@ -19,8 +19,8 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.producer.Producer1;
import org.apache.webbeans.test.component.service.IService;
@@ -43,7 +43,7 @@
public void init()
{
super.init();
- this.container = ManagerImpl.getManager();
+ this.container = BeanManagerImpl.getManager();
}
@Test
@@ -55,7 +55,7 @@
defineSimpleWebBean(Producer1.class);
defineSimpleWebBean(Producer1ConsumerComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
ContextFactory.initRequestContext(null);
ContextFactory.initApplicationContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java Sat Jul 4 06:20:35 2009
@@ -21,7 +21,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.producer.ParametrizedModel1;
import org.apache.webbeans.test.component.producer.ParametrizedModel2;
@@ -117,7 +117,7 @@
public void testProducer4()
{
defineSimpleWebBean(Producer4.class);
- AbstractComponent<Producer4ConsumerComponent> component = defineSimpleWebBean(Producer4ConsumerComponent.class);
+ AbstractBean<Producer4ConsumerComponent> component = defineSimpleWebBean(Producer4ConsumerComponent.class);
ContextFactory.initSessionContext(new MockHttpSession());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java Sat Jul 4 06:20:35 2009
@@ -19,7 +19,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.CheckWithCheckPayment;
import org.apache.webbeans.test.component.producer.ScopeAdaptorComponent;
@@ -56,7 +56,7 @@
ContextFactory.initSessionContext(session);
ContextFactory.initApplicationContext(null);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
Assert.assertEquals(7, getDeployedComponents());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java Sat Jul 4 06:20:35 2009
@@ -20,8 +20,8 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.Singleton;
import org.apache.webbeans.test.component.service.ITyped2;
@@ -43,7 +43,7 @@
public void init()
{
super.init();
- this.container = ManagerImpl.getManager();
+ this.container = BeanManagerImpl.getManager();
}
@SuppressWarnings("unchecked")
@@ -54,7 +54,7 @@
defineSimpleWebBean(Typed2.class);
defineSimpleWebBean(Singleton.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java Sat Jul 4 06:20:35 2009
@@ -21,7 +21,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.test.component.service.ITyped;
import org.apache.webbeans.test.component.service.TypedComponent;
import org.apache.webbeans.test.servlet.TestContext;
@@ -49,10 +49,10 @@
{
clear();
defineSimpleWebBean(TypedComponent.class);
- List<AbstractComponent<?>> list = getComponents();
+ List<AbstractBean<?>> list = getComponents();
@SuppressWarnings("unused")
- AbstractComponent<?> itype = (AbstractComponent<?>) getManager().resolveByType(TypedComponentTest.class.getDeclaredField("s").getType(), new Current()
+ AbstractBean<?> itype = (AbstractBean<?>) getManager().resolveByType(TypedComponentTest.class.getDeclaredField("s").getType(), new Current()
{
public Class<? extends Annotation> annotationType()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java Sat Jul 4 06:20:35 2009
@@ -20,8 +20,8 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.service.ITyped2;
import org.apache.webbeans.test.component.service.Typed2;
@@ -44,7 +44,7 @@
public void init()
{
super.init();
- this.container = ManagerImpl.getManager();
+ this.container = BeanManagerImpl.getManager();
}
@Test
@@ -54,7 +54,7 @@
defineSimpleWebBean(Typed2.class);
defineSimpleWebBean(TypedInjection.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
@@ -86,7 +86,7 @@
defineSimpleWebBean(Typed2.class);
defineSimpleWebBean(TypedInjectionWithoutArguments.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java Sat Jul 4 06:20:35 2009
@@ -20,8 +20,8 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.ContainUserComponent;
import org.apache.webbeans.test.component.UserComponent;
@@ -41,7 +41,7 @@
@Before
public void init()
{
- this.container = ManagerImpl.getManager();
+ this.container = BeanManagerImpl.getManager();
super.init();
}
@@ -52,7 +52,7 @@
defineSimpleWebBean(UserComponent.class);
defineSimpleWebBean(ContainUserComponent.class);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
HttpSession session = getSession();
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java Sat Jul 4 06:20:35 2009
@@ -17,7 +17,7 @@
import java.lang.annotation.Annotation;
import java.util.Set;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.test.component.binding.AnyBindingComponent;
import org.apache.webbeans.test.component.binding.DefaultAnyBinding;
import org.apache.webbeans.test.component.binding.NonAnyBindingComponent;
@@ -42,18 +42,18 @@
@Test
public void testAny()
{
- AbstractComponent<AnyBindingComponent> comp1 = defineSimpleWebBean(AnyBindingComponent.class);
+ AbstractBean<AnyBindingComponent> comp1 = defineSimpleWebBean(AnyBindingComponent.class);
Set<Annotation> bindings = comp1.getBindings();
Assert.assertEquals(2, bindings.size());
- AbstractComponent<NonAnyBindingComponent> comp2 = defineSimpleWebBean(NonAnyBindingComponent.class);
+ AbstractBean<NonAnyBindingComponent> comp2 = defineSimpleWebBean(NonAnyBindingComponent.class);
bindings = comp2.getBindings();
Assert.assertEquals(4, bindings.size());
- AbstractComponent<DefaultAnyBinding> comp3 = defineSimpleWebBean(DefaultAnyBinding.class);
+ AbstractBean<DefaultAnyBinding> comp3 = defineSimpleWebBean(DefaultAnyBinding.class);
bindings = comp3.getBindings();
Assert.assertEquals(2, bindings.size());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java Sat Jul 4 06:20:35 2009
@@ -26,7 +26,7 @@
import junit.framework.Assert;
import org.apache.webbeans.annotation.CurrentLiteral;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.annotation.binding.Binding1Literal;
import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -69,7 +69,7 @@
{
defineSimpleWebBean(CheckWithCheckPayment.class);
defineSimpleWebBeansDecorators(ServiceDecorator.class);
- AbstractComponent<ServiceImpl1> component = defineSimpleWebBean(ServiceImpl1.class);
+ AbstractBean<ServiceImpl1> component = defineSimpleWebBean(ServiceImpl1.class);
ContextFactory.initRequestContext(null);
ContextFactory.initApplicationContext(null);
@@ -93,7 +93,7 @@
public void test2()
{
defineSimpleWebBeansDecorators(LargeTransactionDecorator.class);
- AbstractComponent<AccountComponent> component = defineSimpleWebBean(AccountComponent.class);
+ AbstractBean<AccountComponent> component = defineSimpleWebBean(AccountComponent.class);
ContextFactory.initRequestContext(null);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java Sat Jul 4 06:20:35 2009
@@ -17,7 +17,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.component.dependent.DependentComponent;
import org.apache.webbeans.test.component.dependent.DependentOwnerComponent;
@@ -49,7 +49,7 @@
ContextFactory.initRequestContext(null);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
Assert.assertEquals(2, comps.size());
@@ -69,8 +69,8 @@
ContextFactory.initRequestContext(null);
- AbstractComponent<DependentA> componentA = defineSimpleWebBean(DependentA.class);
- AbstractComponent<DependentB> componentB = defineSimpleWebBean(DependentB.class);
+ AbstractBean<DependentA> componentA = defineSimpleWebBean(DependentA.class);
+ AbstractBean<DependentB> componentB = defineSimpleWebBean(DependentB.class);
Assert.assertNotNull(componentB);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java Sat Jul 4 06:20:35 2009
@@ -20,7 +20,7 @@
import junit.framework.Assert;
import org.apache.webbeans.annotation.CurrentLiteral;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.test.annotation.binding.Check;
import org.apache.webbeans.test.annotation.binding.Role;
@@ -53,7 +53,7 @@
{
clear();
- AbstractComponent<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
+ AbstractBean<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
ContextFactory.initRequestContext(null);
LoggedInEvent event = new LoggedInEvent("Gurkan");
@@ -73,8 +73,8 @@
{
clear();
- AbstractComponent<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
- AbstractComponent<ComponentWithObservable1> componentObservable = defineSimpleWebBean(ComponentWithObservable1.class);
+ AbstractBean<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
+ AbstractBean<ComponentWithObservable1> componentObservable = defineSimpleWebBean(ComponentWithObservable1.class);
ContextFactory.initRequestContext(null);
@@ -91,7 +91,7 @@
{
clear();
- AbstractComponent<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
+ AbstractBean<ComponentWithObserves1> component = defineSimpleWebBean(ComponentWithObserves1.class);
ContextFactory.initRequestContext(null);
LoggedInEvent event = new LoggedInEvent("Gurkan");
@@ -126,7 +126,7 @@
defineSimpleWebBean(CheckWithCheckPayment.class);
defineSimpleWebBean(CheckWithMoneyPayment.class);
defineSimpleWebBean(PaymentProcessorComponent.class);
- AbstractComponent<ComponentWithObserves2> component = defineSimpleWebBean(ComponentWithObserves2.class);
+ AbstractBean<ComponentWithObserves2> component = defineSimpleWebBean(ComponentWithObserves2.class);
ContextFactory.initRequestContext(null);
LoggedInEvent event = new LoggedInEvent("USER");
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java Sat Jul 4 06:20:35 2009
@@ -18,7 +18,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;
import org.apache.webbeans.test.component.exception.AroundInvokeWithFinalMethodComponent;
@@ -120,7 +120,7 @@
try
{
clear();
- defineSimpleWebBean(AbstractComponent.class);
+ defineSimpleWebBean(AbstractBean.class);
}
catch (WebBeansConfigurationException e)
{
@@ -273,7 +273,7 @@
try
{
clear();
- AbstractComponent<MoreThanOnePostConstructComponent> component = defineSimpleWebBean(MoreThanOnePostConstructComponent.class);
+ AbstractBean<MoreThanOnePostConstructComponent> component = defineSimpleWebBean(MoreThanOnePostConstructComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -290,7 +290,7 @@
try
{
clear();
- AbstractComponent<PostContructMethodHasParameterComponent> component = defineSimpleWebBean(PostContructMethodHasParameterComponent.class);
+ AbstractBean<PostContructMethodHasParameterComponent> component = defineSimpleWebBean(PostContructMethodHasParameterComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -307,7 +307,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(PostContructMethodHasReturnTypeComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(PostContructMethodHasReturnTypeComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -324,7 +324,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(PostContructMethodHasCheckedExceptionComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(PostContructMethodHasCheckedExceptionComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -341,7 +341,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(PostContructMethodHasStaticComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(PostContructMethodHasStaticComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -358,7 +358,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(MoreThanOneAroundInvokeComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(MoreThanOneAroundInvokeComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -376,7 +376,7 @@
defineSimpleWebBean(AroundInvokeWithSameMethodNameComponent.class);
Bean<?> comp = getComponents().get(0);
- Assert.assertEquals(0, ((AbstractComponent<?>) comp).getInterceptorStack().size());
+ Assert.assertEquals(0, ((AbstractBean<?>) comp).getInterceptorStack().size());
}
@Test
@@ -385,7 +385,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(AroundInvokeWithoutParameterComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithoutParameterComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -402,7 +402,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(AroundInvokeWithoutReturnTypeComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithoutReturnTypeComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -419,7 +419,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(AroundInvokeWithWrongReturnTypeComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithWrongReturnTypeComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -436,7 +436,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(AroundInvokeWithoutExceptionComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithoutExceptionComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -453,7 +453,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(AroundInvokeWithStaticMethodComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithStaticMethodComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -470,7 +470,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(AroundInvokeWithFinalMethodComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(AroundInvokeWithFinalMethodComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
@@ -487,7 +487,7 @@
try
{
clear();
- AbstractComponent<?> component = defineSimpleWebBean(NoArgConstructorInterceptorComponent.class);
+ AbstractBean<?> component = defineSimpleWebBean(NoArgConstructorInterceptorComponent.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}
catch (WebBeansConfigurationException e)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java Sat Jul 4 06:20:35 2009
@@ -21,7 +21,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.config.inheritance.BeanInheritedMetaData;
import org.apache.webbeans.test.component.inheritance.InheritFromParentComponent;
import org.apache.webbeans.test.component.inheritance.types.InhDeployment1;
@@ -51,7 +51,7 @@
@Test
public void testInheritedComponentMetaData()
{
- AbstractComponent<InheritFromParentComponent> component = defineSimpleWebBean(InheritFromParentComponent.class);
+ AbstractBean<InheritFromParentComponent> component = defineSimpleWebBean(InheritFromParentComponent.class);
BeanInheritedMetaData<InheritFromParentComponent> data = new BeanInheritedMetaData<InheritFromParentComponent>(component);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java Sat Jul 4 06:20:35 2009
@@ -13,7 +13,7 @@
*/
package org.apache.webbeans.test.unittests.inject.generic;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.test.component.inject.generic.GenericComponent;
import org.apache.webbeans.test.component.inject.generic.GenericComponentInjector;
import org.apache.webbeans.test.servlet.TestContext;
@@ -39,7 +39,7 @@
public void testGenericBeanInjection()
{
defineSimpleWebBean(GenericComponent.class);
- AbstractComponent<GenericComponentInjector> bean2 = defineSimpleWebBean(GenericComponentInjector.class);
+ AbstractBean<GenericComponentInjector> bean2 = defineSimpleWebBean(GenericComponentInjector.class);
GenericComponentInjector<?> instance = getManager().getInstance(bean2);
Assert.assertNotNull(instance.getInjection1());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java Sat Jul 4 06:20:35 2009
@@ -19,7 +19,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.test.component.intercept.InterceptedComponent;
@@ -63,7 +63,7 @@
defineSimpleWebBean(InterceptedComponent.class);
ContextFactory.initRequestContext(null);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
Object object = getManager().getInstance(comps.get(0));
@@ -84,7 +84,7 @@
defineSimpleWebBean(MultipleInterceptedComponent.class);
ContextFactory.initRequestContext(null);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
Object object = getManager().getInstance(comps.get(0));
@@ -109,7 +109,7 @@
defineSimpleWebBean(InterceptorWithSuperClassInterceptedComponent.class);
ContextFactory.initRequestContext(null);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
Object object = getManager().getInstance(comps.get(0));
@@ -134,7 +134,7 @@
defineSimpleWebBean(MultipleListOfInterceptedComponent.class);
ContextFactory.initRequestContext(null);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
Object object = getManager().getInstance(comps.get(0));
@@ -157,7 +157,7 @@
defineSimpleWebBean(MultipleListOfInterceptedWithExcludeClassComponent.class);
ContextFactory.initRequestContext(null);
- List<AbstractComponent<?>> comps = getComponents();
+ List<AbstractBean<?>> comps = getComponents();
Object object = getManager().getInstance(comps.get(0));
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java Sat Jul 4 06:20:35 2009
@@ -15,7 +15,7 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;
import org.apache.webbeans.test.component.intercept.MultpleInterceptor;
@@ -42,7 +42,7 @@
{
try
{
- AbstractComponent<MultpleInterceptor> component = defineSimpleWebBean(MultpleInterceptor.class);
+ AbstractBean<MultpleInterceptor> component = defineSimpleWebBean(MultpleInterceptor.class);
EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
}