Author: struberg
Date: Tue May 18 12:35:34 2010
New Revision: 945621
URL: http://svn.apache.org/viewvc?rev=945621&view=rev
Log:
OWB-377 fix logging
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansErrorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Tue May 18 12:35:34 2010
@@ -338,7 +338,7 @@ public class BeansDeployer
{
if(!bean.getScope().equals(Dependent.class))
{
- logger.warn("Bean " + bean.toString() + "has not
DependentScope. If an interceptor or decorator has any scope other than
@Dependent, non-portable behaviour results.");
+ logger.warn(OWBLogConst.WARN_0009, bean.toString());
}
}
@@ -479,7 +479,7 @@ public class BeansDeployer
{
if(EJBWebBeansConfigurator.isSessionBean(implClass))
{
- logger.debug(OWBLogConst.INFO_0010, new
Object[]{implClass.getName()});
+ logger.debug(OWBLogConst.INFO_0010,
implClass.getName());
defineEnterpriseWebBean((Class<Object>)implClass,
(ProcessAnnotatedTypeImpl<Object>)processAnnotatedEvent);
}
}
@@ -619,7 +619,8 @@ public class BeansDeployer
{
if (superClass.equals(specialClass.getSuperclass()))
{
- throw new
InconsistentSpecializationException(logger.getTokenString(OWBLogConst.EXCEPT_XML)
+ logger.getTokenString(OWBLogConst.EXCEPT_0005)
+ throw new
InconsistentSpecializationException(logger.getTokenString(OWBLogConst.EXCEPT_XML)
+ +
logger.getTokenString(OWBLogConst.EXCEPT_0005)
+
superClass.getName());
}
}
@@ -779,7 +780,7 @@ public class BeansDeployer
//Decorator
if(WebBeansAnnotatedTypeUtil.isAnnotatedTypeDecorator(annotatedType))
{
- logger.debug(OWBLogConst.INFO_0012, new
Object[]{annotatedType.getJavaClass().getName()});
+ logger.debug(OWBLogConst.INFO_0012,
annotatedType.getJavaClass().getName());
if(annotationTypeSet)
{
WebBeansAnnotatedTypeUtil.defineDecorator(annotatedType);
@@ -792,7 +793,7 @@ public class BeansDeployer
//Interceptor
else
if(WebBeansAnnotatedTypeUtil.isAnnotatedTypeInterceptor(annotatedType))
{
- logger.debug(OWBLogConst.INFO_0011, new
Object[]{annotatedType.getJavaClass().getName()});
+ logger.debug(OWBLogConst.INFO_0011,
annotatedType.getJavaClass().getName());
if(annotationTypeSet)
{
WebBeansAnnotatedTypeUtil.defineInterceptor(annotatedType);
@@ -810,7 +811,7 @@ public class BeansDeployer
return false;
}
- logger.debug(OWBLogConst.INFO_0009, new
Object[]{annotatedType.getJavaClass().getName()});
+ logger.debug(OWBLogConst.INFO_0009,
annotatedType.getJavaClass().getName());
WebBeansUtil.defineManagedBean(managedBeanCreator,
processInjectionTargetEvent);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
Tue May 18 12:35:34 2010
@@ -57,6 +57,7 @@ public class OWBLogConst
public final static String WARN_0006 = "WARN_0006"; // Conversation
already started with cid : [{1}]
public final static String WARN_0007 = "WARN_0007"; // Conversation
already ended with cid : [{1}]
public final static String WARN_0008 = "WARN_0008"; // Problems processing
type {0}. Type will be ignored. (Exception: {1} {2})
+ public final static String WARN_0009 = "WARN_0009"; // Bean {0} has not
DependentScope. If an interceptor or decorator has any scope other than
@Dependent, non-portable behaviour results.
public final static String ERROR_0001 = "ERROR_0001"; // Unable to inject
resource for : [{1}]
public final static String ERROR_0002 = "ERROR_0002"; // Initialization of
the WebBeans container has failed.
@@ -87,7 +88,7 @@ public class OWBLogConst
public final static String EXCEPT_0004 = "EXCEPT_0004"; // ] must extend
another class.
public final static String EXCEPT_XML = "EXCEPT_XML"; // XML
Specialization Error :
public final static String EXCEPT_0005 = "EXCEPT_0005"; // More than one
class specialized the same super class :
- public final static String EXCEPT_0006 = "EXCEPT_0006"; // Got Exceptions
while sending shutdown to the following plugins :
+ public final static String EXCEPT_0006 = "EXCEPT_0006"; // Got Exceptions
while sending shutdown to the following plugins : {0}
public final static String EXCEPT_0007 = "EXCEPT_0007"; //
TransactionPhase not supported:
public final static String EXCEPT_0008 = "EXCEPT_0008"; // Exception is
thrown while handling event object with type :
public final static String EXCEPT_0009 = "EXCEPT_0009"; // Unable to
unbind object with name :
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
Tue May 18 12:35:34 2010
@@ -129,7 +129,7 @@ public final class DecoratorUtil
}
catch (SecurityException e)
{
- logger.error(OWBLogConst.ERROR_0006, new
Object[]{decClazz.getName(),method.getName()}, e);
+ logger.error(OWBLogConst.ERROR_0006, e,
decClazz.getName(),method.getName());
throw new WebBeansException(e);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
Tue May 18 12:35:34 2010
@@ -86,7 +86,7 @@ public class DelegateHandler implements
}
catch (SecurityException e)
{
- logger.error(OWBLogConst.ERROR_0011, new Object[] {
method.getName(), decorator.getClass().getName() });
+ logger.error(OWBLogConst.ERROR_0011, method.getName(),
decorator.getClass().getName());
throw new WebBeansException(e);
}
@@ -96,13 +96,13 @@ public class DelegateHandler implements
}
catch (InvocationTargetException e)
{
- logger.error(OWBLogConst.ERROR_0012, new Object[] {
method.getName(), decorator.getClass().getName() }, e.getTargetException());
+ logger.error(OWBLogConst.ERROR_0012, e.getTargetException(),
method.getName(), decorator.getClass().getName());
throw new WebBeansException(e);
}
catch (IllegalAccessException e)
{
- logger.error(OWBLogConst.ERROR_0014, new Object[] {
method.getName(), decorator.getClass().getName() });
+ logger.error(OWBLogConst.ERROR_0014, method.getName(),
decorator.getClass().getName());
throw new WebBeansException(e);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
Tue May 18 12:35:34 2010
@@ -125,7 +125,7 @@ public abstract class AbstractLifeCycle
//Start actual starting on sub-classes
afterStartApplication(startupObject);
- logger.info(OWBLogConst.INFO_0002, new
Object[]{Long.toString(System.currentTimeMillis() - begin)});
+ logger.info(OWBLogConst.INFO_0002,
Long.toString(System.currentTimeMillis() - begin));
}
@Override
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
Tue May 18 12:35:34 2010
@@ -55,7 +55,7 @@ public final class WebBeansLogger
/** Private constructor */
private WebBeansLogger()
{
- wbBundle = ResourceBundle.getBundle("openwebbeans/Messages");
+ wbBundle = ResourceBundle.getBundle("openwebbeans/Messages");
}
/**
@@ -163,7 +163,7 @@ public final class WebBeansLogger
public void info(String messageKey)
{
- this.wblLog(WebBeansLogger.WBL_INFO, messageKey);
+ this.wblLog(WebBeansLogger.WBL_INFO, messageKey);
}
public void info(String messageKey, Object... args)
@@ -208,13 +208,13 @@ public final class WebBeansLogger
private String constructMessage(String messageKey, Object... args)
{
- MessageFormat msgFrmt;
- String formattedString;
-
- msgFrmt = new MessageFormat(getTokenString(messageKey),
Locale.getDefault());
- formattedString = msgFrmt.format(args);
-
- return formattedString;
+ MessageFormat msgFrmt;
+ String formattedString;
+
+ msgFrmt = new MessageFormat(getTokenString(messageKey),
Locale.getDefault());
+ formattedString = msgFrmt.format(args);
+
+ return formattedString;
}
public String getTokenString(String messageKey)
@@ -223,7 +223,7 @@ public final class WebBeansLogger
if (this.wbBundle == null)
{
- throw new NullPointerException("ResourceBundle can not be
null");
+ throw new NullPointerException("ResourceBundle can not be null");
}
try
{
@@ -231,7 +231,7 @@ public final class WebBeansLogger
}
catch (MissingResourceException mre)
{
- strVal = null;
+ strVal = null;
}
if (strVal == null)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
Tue May 18 12:35:34 2010
@@ -82,7 +82,7 @@ public class PluginLoader
while(pluginIter.hasNext())
{
OpenWebBeansPlugin plugin = pluginIter.next();
- logger.info(OWBLogConst.INFO_0013, new
Object[]{plugin.getClass().getSimpleName()});
+ logger.info(OWBLogConst.INFO_0013,
plugin.getClass().getSimpleName());
try
{
plugin.startUp();
@@ -144,7 +144,7 @@ public class PluginLoader
{
// we catch ALL exceptions, since we like to continue
shutting down all other plugins!
String pluginName = plugin.getClass().getSimpleName();
- logger.error(OWBLogConst.ERROR_0009, new
Object[]{pluginName}, e);
+ logger.error(OWBLogConst.ERROR_0009, e, pluginName);
failedShutdown.add(pluginName);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansErrorHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansErrorHandler.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansErrorHandler.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansErrorHandler.java
Tue May 18 12:35:34 2010
@@ -34,7 +34,7 @@ public class WebBeansErrorHandler implem
public void error(SAXParseException exception) throws SAXException
{
- logger.error(exception.getMessage(), new
Object[]{exception.getCause()});
+ logger.error(exception.getMessage(), exception.getCause());
throw new WebBeansException(exception);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java
Tue May 18 12:35:34 2010
@@ -36,7 +36,7 @@ public class WebBeansResolver implements
*/
public InputSource resolveEntity(String publicId, String systemId) throws
SAXException, IOException
{
- logger.debug("Resolving systemId with : ", new Object[]{systemId});
+ logger.debug("Resolving systemId with : ",systemId);
if (systemId.equals(WebBeansConstants.WEB_BEANS_XML_SYSID))
{
@@ -44,7 +44,7 @@ public class WebBeansResolver implements
if (stream != null)
{
- logger.debug("Resolving is successful with systemId : ", new
Object[]{systemId});
+ logger.debug("Resolving is successful with systemId :
",systemId);
return createInputSource(stream, publicId, systemId);
}
}
@@ -56,12 +56,12 @@ public class WebBeansResolver implements
if (stream != null)
{
- logger.debug("Resolving is successful with systemId : ", new
Object[]{systemId});
+ logger.debug("Resolving is successful with systemId : ",
systemId);
return createInputSource(stream, publicId, systemId);
}
}
- logger.debug("Resolving failed using default SAXResolver for systemId
: ", new Object[]{systemId});
+ logger.debug("Resolving failed using default SAXResolver for systemId
: ", systemId);
return null;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties?rev=945621&r1=945620&r2=945621&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
Tue May 18 12:35:34 2010
@@ -58,7 +58,7 @@ WARN_0005 = OpenWebBeans Container is al
WARN_0006 = Conversation with cid [{0}] already started
WARN_0007 = Conversation with cid [{0}] already ended
WARN_0008 = Problems processing type {0}. Type will be ignored. (Exception:
{1} {2})
-
+WARN_0009 = Bean {0} has not DependentScope. If an interceptor or decorator
has any scope other than @Dependent, non-portable behaviour results.
#error messages:
ERROR_0001 = Unable to inject resource for : [{0}]
