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 2010/08/21 16:18:11 UTC
svn commit: r987765 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/AbstractInjectionTargetBean.java component/AbstractOwbBean.java
decorator/WebBeansDecorator.java intercept/webbeans/WebBeansInterceptor.java
Author: gerdogdu
Date: Sat Aug 21 14:18:11 2010
New Revision: 987765
URL: http://svn.apache.org/viewvc?rev=987765&view=rev
Log:
[OWB-444] Using Static Loggers in Shared ClassLoader, super type include loggers
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=987765&r1=987764&r2=987765&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Sat Aug 21 14:18:11 2010
@@ -65,9 +65,6 @@ import org.apache.webbeans.util.WebBeans
*/
public abstract class AbstractInjectionTargetBean<T> extends AbstractOwbBean<T> implements InjectionTargetBean<T>
{
- /** Logger instance */
- private final WebBeansLogger log = WebBeansLogger.getLogger(AbstractInjectionTargetBean.class);
-
/** Bean observable method */
private Set<Method> observableMethods = new HashSet<Method>();
@@ -264,7 +261,7 @@ public abstract class AbstractInjectionT
catch (Exception e)
{
- log.error(OWBLogConst.ERROR_0008, e, "@PostConstruct.");
+ logger.error(OWBLogConst.ERROR_0008, e, "@PostConstruct.");
throw new WebBeansException(e);
}
}
@@ -302,7 +299,7 @@ public abstract class AbstractInjectionT
}
catch (Exception e)
{
- log.error(OWBLogConst.ERROR_0008, e, "@PreDestroy.");
+ logger.error(OWBLogConst.ERROR_0008, e, "@PreDestroy.");
throw new WebBeansException(e);
}
}
@@ -419,9 +416,9 @@ public abstract class AbstractInjectionT
}
catch (Exception e)
{
- log.error(OWBLogConst.ERROR_0023, instance);
+ logger.error(OWBLogConst.ERROR_0023, instance);
throw new WebBeansException(MessageFormat.format(
- log.getTokenString(OWBLogConst.ERROR_0023), instance), e);
+ logger.getTokenString(OWBLogConst.ERROR_0023), instance), e);
}
}
}
@@ -560,7 +557,7 @@ public abstract class AbstractInjectionT
*/
protected WebBeansLogger getLogger()
{
- return this.log;
+ return this.logger;
}
/**
@@ -605,7 +602,7 @@ public abstract class AbstractInjectionT
if(!decorator.isPassivationCapable())
{
throw new WebBeansConfigurationException(MessageFormat.format(
- log.getTokenString(OWBLogConst.EXCEPT_0015), toString()));
+ logger.getTokenString(OWBLogConst.EXCEPT_0015), toString()));
}
else
{
@@ -621,7 +618,7 @@ public abstract class AbstractInjectionT
if(!interceptor.isPassivationCapable())
{
throw new WebBeansConfigurationException(MessageFormat.format(
- log.getTokenString(OWBLogConst.EXCEPT_0016), toString()));
+ logger.getTokenString(OWBLogConst.EXCEPT_0016), toString()));
}
else
{
@@ -636,14 +633,14 @@ public abstract class AbstractInjectionT
if(!Serializable.class.isAssignableFrom(interceptorClass))
{
throw new WebBeansConfigurationException(MessageFormat.format(
- log.getTokenString(OWBLogConst.EXCEPT_0016), toString()));
+ logger.getTokenString(OWBLogConst.EXCEPT_0016), toString()));
}
else
{
if(!OWBInjector.checkInjectionPointForInterceptorPassivation(interceptorClass))
{
throw new WebBeansConfigurationException(MessageFormat.format(
- log.getTokenString(OWBLogConst.EXCEPT_0017), toString(), interceptorClass));
+ logger.getTokenString(OWBLogConst.EXCEPT_0017), toString(), interceptorClass));
}
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=987765&r1=987764&r2=987765&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java Sat Aug 21 14:18:11 2010
@@ -53,7 +53,7 @@ import org.apache.webbeans.util.WebBeans
public abstract class AbstractOwbBean<T> implements OwbBean<T>
{
/**Logger instance*/
- private final WebBeansLogger logger = WebBeansLogger.getLogger(getClass());
+ protected final WebBeansLogger logger = WebBeansLogger.getLogger(getClass());
/** Name of the bean */
protected String name;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=987765&r1=987764&r2=987765&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Sat Aug 21 14:18:11 2010
@@ -64,8 +64,6 @@ import org.apache.webbeans.util.Security
*/
public class WebBeansDecorator<T> extends AbstractInjectionTargetBean<T> implements OwbDecorator<T>
{
- private final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansDecorator.class);
-
/** Decorator class */
private Class<?> clazz;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=987765&r1=987764&r2=987765&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java Sat Aug 21 14:18:11 2010
@@ -74,8 +74,6 @@ import org.apache.webbeans.xml.XMLAnnota
*/
public class WebBeansInterceptor<T> extends AbstractOwbBean<T> implements OwbInterceptor<T>
{
- private final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansInterceptor.class);
-
/** InterceptorBindingTypes exist on the interceptor class */
private Map<Class<? extends Annotation>, Annotation> interceptorBindingSet = new HashMap<Class<? extends Annotation>, Annotation>();