You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by co...@apache.org on 2010/01/15 17:56:59 UTC
svn commit: r899711 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
Author: covener
Date: Fri Jan 15 16:56:58 2010
New Revision: 899711
URL: http://svn.apache.org/viewvc?rev=899711&view=rev
Log:
OWB-232 In the non-OWB-specific case, include the classname for missing or
duplicate Interceptor or Decorator entries in beans.xml
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=899711&r1=899710&r2=899711&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Fri Jan 15 16:56:58 2010
@@ -534,18 +534,21 @@
if (clazz == null)
{
- throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Interceptor class : " + XMLUtil.getName(child) + " not found");
+ throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Interceptor class : " +
+ (this.owbSpecificConfiguration ? XMLUtil.getName(child) : child.getTextTrim()) + " not found");
}
else
{
if (!AnnotationUtil.hasInterceptorBindingMetaAnnotation(clazz.getDeclaredAnnotations()))
{
- throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Interceptor class : " + XMLUtil.getName(child) + " must have at least one @InterceptorBindingType");
+ throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Interceptor class : " +
+ (this.owbSpecificConfiguration ? XMLUtil.getName(child) : child.getTextTrim()) + " must have at least one @InterceptorBindingType");
}
if (manager.isInterceptorEnabled(clazz))
{
- throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Interceptor class : " + XMLUtil.getName(child) + " is already defined");
+ throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Interceptor class : " +
+ (this.owbSpecificConfiguration ? XMLUtil.getName(child) : child.getTextTrim()) + " is already defined");
}
manager.addNewInterceptor(clazz);
@@ -582,14 +585,16 @@
if (clazz == null)
{
- throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Decorator class : " + XMLUtil.getName(child) + " not found");
+ throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Decorator class : " +
+ (this.owbSpecificConfiguration ? XMLUtil.getName(child) : child.getTextTrim()) + " not found");
}
else
{
if (manager.isDecoratorEnabled(clazz))
{
- throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Decorator class : " + XMLUtil.getName(child) + " is already defined");
+ throw new WebBeansConfigurationException(createConfigurationFailedMessage() + "Decorator class : " +
+ (this.owbSpecificConfiguration ? XMLUtil.getName(child) : child.getTextTrim()) + " is already defined");
}
manager.addNewDecorator(clazz);