Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java (original) +++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java Mon Jul 16 19:56:23 2012 @@ -30,7 +30,10 @@ import org.apache.webbeans.context.Conte import org.apache.webbeans.context.ConversationContext; import org.apache.webbeans.conversation.ConversationImpl; import org.apache.webbeans.conversation.ConversationManager; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; + +import java.util.logging.Level; +import java.util.logging.Logger; /** * Conversation related phase listener. @@ -43,7 +46,7 @@ public class WebBeansPhaseListener imple private static final long serialVersionUID = 1L; /**Logger instance*/ - private final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansPhaseListener.class); + private final Logger logger = WebBeansLoggerFacade.getLogger(WebBeansPhaseListener.class); private Boolean owbApplication = null; @@ -67,9 +70,9 @@ public class WebBeansPhaseListener imple if (conversation.isTransient()) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Destroying the conversation context with cid : [{0}]", conversation.getId()); + logger.log(Level.FINE, "Destroying the conversation context with cid : [{0}]", conversation.getId()); } contextFactory.destroyConversationContext(); } @@ -107,9 +110,9 @@ public class WebBeansPhaseListener imple if (conversation.isTransient()) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Creating a new transitional conversation with cid : [{0}]", conversation.getId()); + logger.log(Level.FINE, "Creating a new transitional conversation with cid : [{0}]", conversation.getId()); } contextFactory.initConversationContext(null); @@ -121,9 +124,9 @@ public class WebBeansPhaseListener imple } else { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Restoring conversation with cid : [{0}]", conversation.getId()); + logger.log(Level.FINE, "Restoring conversation with cid : [{0}]", conversation.getId()); } //Conversation must be used by one thread at a time
Modified: openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java (original) +++ openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java Mon Jul 16 19:56:23 2012 @@ -19,7 +19,7 @@ package org.apache.webbeans.osgi.scanner; import org.apache.webbeans.exception.WebBeansDeploymentException; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.BDABeansXmlScanner; import org.apache.webbeans.spi.ScannerService; @@ -45,6 +45,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.logging.Logger; import java.util.zip.ZipEntry; /** @@ -55,7 +56,7 @@ import java.util.zip.ZipEntry; */ public class OsgiMetaDataScannerService implements ScannerService { - private WebBeansLogger logger = WebBeansLogger.getLogger(OsgiMetaDataScannerService.class); + private Logger logger = WebBeansLoggerFacade.getLogger(OsgiMetaDataScannerService.class); protected ServletContext servletContext = null; private static final String META_INF_BEANS_XML = "META-INF/beans.xml"; Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java (original) +++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java Mon Jul 16 19:56:23 2012 @@ -22,6 +22,8 @@ import java.net.URL; import java.util.Collection; import java.util.Iterator; import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.ejb.Singleton; import javax.ejb.Stateful; @@ -47,7 +49,7 @@ import org.apache.openejb.jee.StatefulBe import org.apache.openejb.jee.StatelessBean; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.lifecycle.StandaloneLifeCycle; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl; import org.jboss.testharness.api.DeploymentException; import org.jboss.testharness.spi.StandaloneContainers; @@ -55,7 +57,7 @@ import org.jboss.testharness.spi.Standal public class StandaloneContainersImpl implements StandaloneContainers { /**Logger instance*/ - protected final WebBeansLogger logger = WebBeansLogger.getLogger(StandaloneContainersImpl.class); + protected final Logger logger = WebBeansLoggerFacade.getLogger(StandaloneContainersImpl.class); protected StandaloneLifeCycle lifeCycle = null; @@ -88,7 +90,7 @@ public class StandaloneContainersImpl im } catch (Exception e) { - logger.error(e); + logger.log(Level.SEVERE, "Standalone Container Impl.", e); this.excpetion = new DeploymentException("Standalone Container Impl.", e); throw this.excpetion; } @@ -133,7 +135,7 @@ public class StandaloneContainersImpl im } catch (Exception e) { - logger.error(e); + logger.log(Level.SEVERE, "Standalone Container Impl.", e); this.excpetion = new DeploymentException("Standalone Container Impl.", e); return false; @@ -222,7 +224,7 @@ public class StandaloneContainersImpl im } catch (Exception e) { - logger.error(e); + logger.log(Level.SEVERE, "Standalone Container Impl.", e); return false; } Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java (original) +++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java Mon Jul 16 19:56:23 2012 @@ -22,6 +22,8 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.httpclient.Credentials; import org.apache.commons.httpclient.HttpClient; @@ -31,7 +33,7 @@ import org.apache.commons.httpclient.aut import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.InputStreamRequestEntity; import org.apache.commons.httpclient.methods.PutMethod; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.jboss.testharness.api.DeploymentException; import org.jboss.testharness.spi.Containers; import org.jboss.testharness.spi.helpers.AbstractContainerConnector; @@ -44,7 +46,7 @@ import org.jboss.testharness.spi.helpers public class TomcatConnector extends AbstractContainerConnector implements Containers { - private WebBeansLogger logger = WebBeansLogger.getLogger(TomcatConnector.class); + private Logger logger = WebBeansLoggerFacade.getLogger(TomcatConnector.class); private static final String SERVER_HOME_PROPERTY_NAME = "tomcat.home"; @@ -56,7 +58,7 @@ public class TomcatConnector extends Abs public TomcatConnector() throws IOException { - logger.info("You must add the the tests/secret user to Tomcat, for example, in $CATALINA_BASE/conf/tomcat-users.xml add " + + logger.log(Level.INFO, "You must add the the tests/secret user to Tomcat, for example, in $CATALINA_BASE/conf/tomcat-users.xml add " + "<user name=\"tests\" password=\"secret\" roles=\"standard,manager\" />"); tmpdir = new File(System.getProperty("java.io.tmpdir"), "org.jboss.webbeans.tck.integration.jbossas"); tmpdir.mkdir(); Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java (original) +++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java Mon Jul 16 19:56:23 2012 @@ -28,6 +28,8 @@ import java.lang.reflect.Modifier; import java.text.MessageFormat; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.annotation.Resource; import javax.enterprise.inject.Produces; @@ -40,7 +42,7 @@ import org.apache.webbeans.component.Res import org.apache.webbeans.config.OWBLogConst; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.exception.WebBeansException; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.spi.ResourceInjectionService; import org.apache.webbeans.spi.api.ResourceReference; @@ -56,7 +58,7 @@ public class StandaloneResourceInjection private final StandaloneResourceProcessor processor = StandaloneResourceProcessor.getProcessor(); - private static final WebBeansLogger logger = WebBeansLogger.getLogger(StandaloneResourceInjectionService.class); + private static final Logger logger = WebBeansLoggerFacade.getLogger(StandaloneResourceInjectionService.class); private final WebBeansContext webBeansContext; @@ -143,8 +145,8 @@ public class StandaloneResourceInjection } catch(Exception e) { - logger.error(OWBLogConst.ERROR_0025, e, field); - throw new WebBeansException(MessageFormat.format(logger.getTokenString(OWBLogConst.ERROR_0025), field), e); + logger.log(Level.SEVERE, WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0025, e, field)); + throw new WebBeansException(MessageFormat.format(WebBeansLoggerFacade.getTokenString(OWBLogConst.ERROR_0025), field), e); } } Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java (original) +++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java Mon Jul 16 19:56:23 2012 @@ -21,6 +21,8 @@ package org.apache.webbeans.resource.spi import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.annotation.Resource; import javax.naming.InitialContext; @@ -31,13 +33,13 @@ import javax.persistence.PersistenceCont import javax.persistence.PersistenceUnit; import javax.xml.ws.WebServiceRef; import org.apache.webbeans.config.OWBLogConst; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; public class StandaloneResourceProcessor { private static InitialContext context = null; - private static WebBeansLogger logger = WebBeansLogger.getLogger(StandaloneResourceProcessor.class); + private static Logger logger = WebBeansLoggerFacade.getLogger(StandaloneResourceProcessor.class); private static StandaloneResourceProcessor processor = new StandaloneResourceProcessor(); @@ -69,7 +71,7 @@ public class StandaloneResourceProcessor EntityManager obj = getPersistenceContext(persistenceContext.unitName()); if (obj == null) { - logger.warn(OWBLogConst.WARN_0014, "@PersistenceContext", persistenceContext.unitName()); + logger.log(Level.WARNING, WebBeansLoggerFacade.constructMessage(OWBLogConst.WARN_0014, "@PersistenceContext", persistenceContext.unitName())); } return clazz.cast(obj); @@ -80,7 +82,7 @@ public class StandaloneResourceProcessor EntityManagerFactory factory = getPersistenceUnit(persistenceUnit.unitName()); if (factory == null) { - logger.warn(OWBLogConst.WARN_0014, "@PersistenceUnit", persistenceUnit.unitName()); + logger.log(Level.WARNING, WebBeansLoggerFacade.constructMessage(OWBLogConst.WARN_0014, "@PersistenceUnit", persistenceUnit.unitName())); } return clazz.cast(factory); @@ -94,13 +96,13 @@ public class StandaloneResourceProcessor obj = context.lookup("java:/comp/env/"+ resource.name()); if (obj == null) { - logger.warn(OWBLogConst.WARN_0014, "@Resource", resource.name()); + logger.log(Level.WARNING, WebBeansLoggerFacade.constructMessage(OWBLogConst.WARN_0014, "@Resource", resource.name())); } } catch(Exception e) { - logger.error(OWBLogConst.ERROR_0001, resource); + logger.log(Level.SEVERE, WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0001, resource)); } return resourceType.cast(obj); @@ -114,13 +116,13 @@ public class StandaloneResourceProcessor obj = context.lookup("java:/comp/env/"+ resource.name()); if (obj == null) { - logger.warn(OWBLogConst.WARN_0014, "@WebServiceRef", resource.name()); + logger.log(Level.WARNING, WebBeansLoggerFacade.constructMessage(OWBLogConst.WARN_0014, "@WebServiceRef", resource.name())); } } catch(Exception e) { - logger.error(OWBLogConst.ERROR_0001, resource); + logger.log(Level.SEVERE, WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0001, resource)); } return resourceType.cast(obj); @@ -169,7 +171,7 @@ public class StandaloneResourceProcessor } catch(Exception e) { - logger.warn(OWBLogConst.WARN_0006, e, key); + logger.log(Level.WARNING, WebBeansLoggerFacade.constructMessage(OWBLogConst.WARN_0006, e, key)); } } } Modified: openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java (original) +++ openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java Mon Jul 16 19:56:23 2012 @@ -20,6 +20,8 @@ package org.apache.webbeans.cditest.owb; import java.lang.annotation.Annotation; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.ConversationScoped; @@ -36,7 +38,7 @@ import org.apache.webbeans.cditest.CdiTe import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.context.ContextFactory; import org.apache.webbeans.context.type.ContextTypes; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.ContainerLifecycle; import org.apache.webbeans.util.InjectionExceptionUtils; @@ -45,7 +47,7 @@ import org.apache.webbeans.util.Injectio */ public class CdiTestOpenWebBeansContainer implements CdiTestContainer { - private static final WebBeansLogger logger = WebBeansLogger.getLogger(CdiTestOpenWebBeansContainer.class); + private static final Logger logger = WebBeansLoggerFacade.getLogger(CdiTestOpenWebBeansContainer.class); private ContainerLifecycle lifecycle = null; private MockServletContext servletContext = null; @@ -133,9 +135,9 @@ public class CdiTestOpenWebBeansContaine } else { - if(logger.wblWillLogWarn()) + if(logger.isLoggable(Level.WARNING)) { - logger.warn("destroy was called for an inactive context (" + Singleton.class.getName() + ")"); + logger.warning("destroy was called for an inactive context (" + Singleton.class.getName() + ")"); } } @@ -155,9 +157,9 @@ public class CdiTestOpenWebBeansContaine } else { - if(logger.wblWillLogWarn()) + if(logger.isLoggable(Level.WARNING)) { - logger.warn("destroy was called for an inactive context (" + ApplicationScoped.class.getName() + ")"); + logger.warning("destroy was called for an inactive context (" + ApplicationScoped.class.getName() + ")"); } } } @@ -174,9 +176,9 @@ public class CdiTestOpenWebBeansContaine } else { - if(logger.wblWillLogWarn()) + if(logger.isLoggable(Level.WARNING)) { - logger.warn("destroy was called for an inactive context (" + ConversationScoped.class.getName() + ")"); + logger.warning("destroy was called for an inactive context (" + ConversationScoped.class.getName() + ")"); } } } @@ -198,9 +200,9 @@ public class CdiTestOpenWebBeansContaine } else { - if(logger.wblWillLogWarn()) + if(logger.isLoggable(Level.WARNING)) { - logger.warn("destroy was called for an inactive context (" + RequestScoped.class.getName() + ")"); + logger.warning("destroy was called for an inactive context (" + RequestScoped.class.getName() + ")"); } } } @@ -217,9 +219,9 @@ public class CdiTestOpenWebBeansContaine } else { - if(logger.wblWillLogWarn()) + if(logger.isLoggable(Level.WARNING)) { - logger.warn("destroy was called for an inactive context (" + SessionScoped.class.getName() + ")"); + logger.warning("destroy was called for an inactive context (" + SessionScoped.class.getName() + ")"); } } } Modified: openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java (original) +++ openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java Mon Jul 16 19:56:23 2012 @@ -21,15 +21,17 @@ package org.apache.webbeans.web.tomcat; import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.naming.NamingException; import org.apache.AnnotationProcessor; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; public class TomcatAnnotProcessor implements AnnotationProcessor { - private final WebBeansLogger logger = WebBeansLogger.getLogger(TomcatAnnotProcessor.class); + private final Logger logger = WebBeansLoggerFacade.getLogger(TomcatAnnotProcessor.class); private AnnotationProcessor processor; @@ -59,7 +61,7 @@ public class TomcatAnnotProcessor implem } catch (Exception e) { - logger.error(e); + logger.log(Level.SEVERE, "TomcatAnnotProcessor", e); } } processor.preDestroy(obj); @@ -78,7 +80,7 @@ public class TomcatAnnotProcessor implem } catch (Exception e) { - logger.error(e); + logger.log(Level.SEVERE, "TomcatAnnotProcessor", e); } } Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java Mon Jul 16 19:56:23 2012 @@ -23,7 +23,7 @@ import org.apache.webbeans.component.Inj import org.apache.webbeans.config.OWBLogConst; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.el.ELContextStore; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.ContainerLifecycle; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.util.WebBeansUtil; @@ -43,6 +43,8 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Initializing the beans container for using in a web application @@ -60,7 +62,7 @@ public class WebBeansConfigurationFilter private static final String CALL_COUNT_ATTRIBUTE_NAME = WebBeansConfigurationFilter.class.getName(); /**Logger instance*/ - private static final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansConfigurationFilter.class); + private static final Logger logger = WebBeansLoggerFacade.getLogger(WebBeansConfigurationFilter.class); /**Manages the container lifecycle*/ protected ContainerLifecycle lifeCycle = null; @@ -93,7 +95,8 @@ public class WebBeansConfigurationFilter } catch (Exception e) { - logger.error(OWBLogConst.ERROR_0018, ServletCompatibilityUtil.getServletInfo(servletContext)); + logger.log(Level.SEVERE, + WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0018, ServletCompatibilityUtil.getServletInfo(servletContext))); WebBeansUtil.throwRuntimeExceptions(e); } } @@ -147,9 +150,9 @@ public class WebBeansConfigurationFilter { try { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Starting a new request : [{0}]", servletRequest.getRemoteAddr()); + logger.log(Level.FINE, "Starting a new request : [{0}]", servletRequest.getRemoteAddr()); } this.lifeCycle.getContextService().startContext(RequestScoped.class, @@ -160,16 +163,17 @@ public class WebBeansConfigurationFilter } catch (Exception e) { - logger.error(OWBLogConst.ERROR_0019, servletRequest); + logger.log(Level.SEVERE, + WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0019, servletRequest)); WebBeansUtil.throwRuntimeExceptions(e); } } public void requestDestroyed(ServletRequest request) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Destroying a request : [{0}]", request.getRemoteAddr()); + logger.log(Level.FINE, "Destroying a request : [{0}]", request.getRemoteAddr()); } if (failoverService != null && Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java Mon Jul 16 19:56:23 2012 @@ -22,19 +22,21 @@ package org.apache.webbeans.servlet; import org.apache.webbeans.config.OWBLogConst; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.conversation.ConversationManager; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.ContainerLifecycle; import org.apache.webbeans.util.WebBeansUtil; import javax.enterprise.context.SessionScoped; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; +import java.util.logging.Level; +import java.util.logging.Logger; public class WebBeansConfigurationHttpSessionListener implements HttpSessionListener { /**Logger instance*/ - private static final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansConfigurationHttpSessionListener.class); + private static final Logger logger = WebBeansLoggerFacade.getLogger(WebBeansConfigurationHttpSessionListener.class); /**Manages the container lifecycle*/ protected ContainerLifecycle lifeCycle = null; @@ -51,15 +53,16 @@ public class WebBeansConfigurationHttpSe { try { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Starting a session with session id : [{0}]", event.getSession().getId()); + logger.log(Level.FINE, "Starting a session with session id : [{0}]", event.getSession().getId()); } this.lifeCycle.getContextService().startContext(SessionScoped.class, event.getSession()); } catch (Exception e) { - logger.error(OWBLogConst.ERROR_0020, event.getSession()); + logger.log(Level.SEVERE, + WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0020, event.getSession())); WebBeansUtil.throwRuntimeExceptions(e); } } @@ -69,9 +72,9 @@ public class WebBeansConfigurationHttpSe */ public void sessionDestroyed(HttpSessionEvent event) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Destroying a session with session id : [{0}]", event.getSession().getId()); + logger.log(Level.FINE, "Destroying a session with session id : [{0}]", event.getSession().getId()); } this.lifeCycle.getContextService().endContext(SessionScoped.class, event.getSession()); Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java Mon Jul 16 19:56:23 2012 @@ -23,7 +23,7 @@ import org.apache.webbeans.config.OWBLog import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.conversation.ConversationManager; import org.apache.webbeans.el.ELContextStore; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.ContainerLifecycle; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.util.WebBeansUtil; @@ -38,6 +38,8 @@ import javax.servlet.ServletRequestEvent import javax.servlet.ServletRequestListener; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Initializing the beans container for using in an web application @@ -54,7 +56,7 @@ import javax.servlet.http.HttpSessionLis public class WebBeansConfigurationListener implements ServletContextListener, ServletRequestListener, HttpSessionListener { /**Logger instance*/ - private static final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansConfigurationListener.class); + private static final Logger logger = WebBeansLoggerFacade.getLogger(WebBeansConfigurationListener.class); /**Manages the container lifecycle*/ protected ContainerLifecycle lifeCycle = null; @@ -84,7 +86,10 @@ public class WebBeansConfigurationListen } catch (Exception e) { - logger.error(OWBLogConst.ERROR_0018, ServletCompatibilityUtil.getServletInfo(event.getServletContext())); + logger.log(Level.SEVERE, + WebBeansLoggerFacade.constructMessage( + OWBLogConst.ERROR_0018, + ServletCompatibilityUtil.getServletInfo(event.getServletContext()))); WebBeansUtil.throwRuntimeExceptions(e); } } @@ -107,9 +112,9 @@ public class WebBeansConfigurationListen */ public void requestDestroyed(ServletRequestEvent event) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Destroying a request : [{0}]", event.getServletRequest().getRemoteAddr()); + logger.log(Level.FINE, "Destroying a request : [{0}]", event.getServletRequest().getRemoteAddr()); } // clean up the EL caches after each request @@ -141,9 +146,9 @@ public class WebBeansConfigurationListen { try { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Starting a new request : [{0}]", event.getServletRequest().getRemoteAddr()); + logger.log(Level.FINE, "Starting a new request : [{0}]", event.getServletRequest().getRemoteAddr()); } this.lifeCycle.getContextService().startContext(RequestScoped.class, event); @@ -153,7 +158,8 @@ public class WebBeansConfigurationListen } catch (Exception e) { - logger.error(OWBLogConst.ERROR_0019, event.getServletRequest()); + logger.log(Level.SEVERE, + WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0019, event.getServletRequest())); WebBeansUtil.throwRuntimeExceptions(e); } } @@ -165,15 +171,16 @@ public class WebBeansConfigurationListen { try { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Starting a session with session id : [{0}]", event.getSession().getId()); + logger.log(Level.FINE, "Starting a session with session id : [{0}]", event.getSession().getId()); } this.lifeCycle.getContextService().startContext(SessionScoped.class, event.getSession()); } catch (Exception e) { - logger.error(OWBLogConst.ERROR_0020, event.getSession()); + logger.log(Level.SEVERE, + WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0020, event.getSession())); WebBeansUtil.throwRuntimeExceptions(e); } } @@ -183,9 +190,9 @@ public class WebBeansConfigurationListen */ public void sessionDestroyed(HttpSessionEvent event) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Destroying a session with session id : [{0}]", event.getSession().getId()); + logger.log(Level.FINE, "Destroying a session with session id : [{0}]", event.getSession().getId()); } this.lifeCycle.getContextService().endContext(SessionScoped.class, event.getSession()); Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Mon Jul 16 19:56:23 2012 @@ -31,7 +31,7 @@ import org.apache.webbeans.context.Singl import org.apache.webbeans.conversation.ConversationImpl; import org.apache.webbeans.conversation.ConversationManager; import org.apache.webbeans.el.ELContextStore; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler; @@ -51,6 +51,8 @@ import javax.servlet.http.HttpSession; import java.lang.annotation.Annotation; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Web container {@link org.apache.webbeans.spi.ContextsService} @@ -59,7 +61,7 @@ import java.util.concurrent.ConcurrentHa public class WebContextsService extends AbstractContextsService { /**Logger instance*/ - private static final WebBeansLogger logger = WebBeansLogger.getLogger(WebContextsService.class); + private static final Logger logger = WebBeansLoggerFacade.getLogger(WebContextsService.class); /**Current request context*/ private static ThreadLocal<RequestContext> requestContexts = null; @@ -426,9 +428,9 @@ public class WebContextsService extends if (conversation.isTransient()) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Destroying the conversation context with cid : [{0}]", conversation.getId()); + logger.log(Level.FINE, "Destroying the conversation context with cid : [{0}]", conversation.getId()); } ContextFactory contextFactory = webBeansContext.getContextFactory(); contextFactory.destroyConversationContext(); @@ -741,9 +743,9 @@ public class WebContextsService extends private Context lazyStartSessionContext() { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug(">lazyStartSessionContext"); + logger.log(Level.FINE, ">lazyStartSessionContext"); } Context webContext = null; @@ -763,30 +765,30 @@ public class WebContextsService extends failoverService.sessionIsInUse(currentSession); } - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("Lazy SESSION context initialization SUCCESS"); + logger.log(Level.FINE, "Lazy SESSION context initialization SUCCESS"); } } catch (Exception e) { - logger.error(OWBLogConst.ERROR_0013, e); + logger.log(Level.SEVERE, WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0013, e)); } } else { - logger.warn("Could NOT lazily initialize session context because NO active request context"); + logger.log(Level.WARNING, "Could NOT lazily initialize session context because NO active request context"); } } else { - logger.warn("Could NOT lazily initialize session context because of "+context+" RequestContext"); + logger.log(Level.WARNING, "Could NOT lazily initialize session context because of "+context+" RequestContext"); } - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("<lazyStartSessionContext "+ webContext); + logger.log(Level.FINE, "<lazyStartSessionContext "+ webContext); } return webContext; } Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java Mon Jul 16 19:56:23 2012 @@ -26,6 +26,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.util.logging.Level; +import java.util.logging.Logger; import javassist.util.proxy.ProxyObjectOutputStream; @@ -33,14 +35,14 @@ import javax.enterprise.inject.spi.Bean; import javax.servlet.http.HttpSession; import org.apache.webbeans.config.WebBeansContext; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.util.WebBeansUtil; public class DefaultOwbFailOverService implements FailOverService { /**Logger instance*/ - private static final WebBeansLogger logger = WebBeansLogger.getLogger(DefaultOwbFailOverService.class); + private static final Logger logger = WebBeansLoggerFacade.getLogger(DefaultOwbFailOverService.class); private static final String OWB_FAILOVER_JVM_ID = UUID.randomUUID().toString() + "_" + System.currentTimeMillis(); @@ -94,14 +96,14 @@ public class DefaultOwbFailOverService i } catch (Exception e) { - logger.error("DefaultOwbFailOverService could not instanciate: [{0}]", e, value); + logger.log(Level.SEVERE, "DefaultOwbFailOverService could not instanciate: [" + value + "]", e); } } - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("DefaultOwbFailOverService isSupportFailOver: [{0}]", String.valueOf(isSupportFailOver)); - logger.debug("DefaultOwbFailOverService isSupportPassivation: [{0}]", String.valueOf(isSupportPassivation)); + logger.log(Level.FINE, "DefaultOwbFailOverService isSupportFailOver: [{0}]", String.valueOf(isSupportFailOver)); + logger.log(Level.FINE, "DefaultOwbFailOverService isSupportPassivation: [{0}]", String.valueOf(isSupportPassivation)); } } @@ -164,9 +166,9 @@ public class DefaultOwbFailOverService i (FailOverBagWrapper)session.getAttribute(getFailOverAttributeName()); if (bagWrapper != null) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("DefaultOwbFailOverService restoreBeans for session: [{0}]", session); + logger.log(Level.FINE, "DefaultOwbFailOverService restoreBeans for session: [{0}]", session); } bagWrapper.restore(); session.removeAttribute(getFailOverAttributeName()); Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java Mon Jul 16 19:56:23 2012 @@ -20,6 +20,8 @@ package org.apache.webbeans.web.failover import java.io.Serializable; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.enterprise.context.Conversation; import javax.enterprise.context.SessionScoped; @@ -29,7 +31,7 @@ import org.apache.webbeans.config.WebBea import org.apache.webbeans.context.ConversationContext; import org.apache.webbeans.context.SessionContext; import org.apache.webbeans.conversation.ConversationManager; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.web.context.SessionContextManager; import org.apache.webbeans.web.context.WebContextsService; @@ -47,8 +49,8 @@ public class FailOverBag implements Seri private static final long serialVersionUID = -6314819837009653189L; /**Logger instance*/ - protected final WebBeansLogger logger = - WebBeansLogger.getLogger(FailOverBag.class); + protected final Logger logger = + WebBeansLoggerFacade.getLogger(FailOverBag.class); private String sessionId; @@ -111,7 +113,7 @@ public class FailOverBag implements Seri } catch (Exception e) { - logger.error(e); + logger.log(Level.SEVERE, "FailOverBag", e); } } Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java Mon Jul 16 19:56:23 2012 @@ -27,13 +27,15 @@ import java.io.ObjectInputStream; import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionActivationListener; import javax.servlet.http.HttpSessionEvent; import org.apache.webbeans.config.WebBeansContext; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.FailOverService; /** @@ -43,8 +45,7 @@ import org.apache.webbeans.spi.FailOverS public class FailOverBagWrapper implements Serializable, Externalizable, HttpSessionActivationListener { /**Logger instance*/ - protected final WebBeansLogger logger = - WebBeansLogger.getLogger(FailOverBagWrapper.class); + protected final Logger logger = WebBeansLoggerFacade.getLogger(FailOverBagWrapper.class); private transient FailOverService failoverService; @@ -79,17 +80,17 @@ public class FailOverBagWrapper implemen if (!isSessionInUse) { bag.restore(); - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug(sessionId + " from " + bag.getJVMId() - + "is restored successfully." ); + logger.log(Level.FINE, sessionId + " from " + bag.getJVMId() + + "is restored successfully."); } } else { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("restore is skipped because isSessionInUse is true for session " + sessionId); + logger.log(Level.FINE, "restore is skipped because isSessionInUse is true for session " + sessionId); } } } @@ -120,9 +121,9 @@ public class FailOverBagWrapper implemen out.writeObject(sessionId); if (isSessionInUse) { - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("writeExternal skip writing because session is in use for sessionid" + + logger.log(Level.FINE, "writeExternal skip writing because session is in use for sessionid" + sessionId); } return; Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java Mon Jul 16 19:56:23 2012 @@ -24,7 +24,7 @@ import org.apache.webbeans.config.OpenWe import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.lifecycle.AbstractLifeCycle; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.spi.ResourceInjectionService; import org.apache.webbeans.spi.adaptor.ELAdaptor; import org.apache.webbeans.web.context.WebContextsService; @@ -40,6 +40,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; +import java.util.logging.Level; /** * Manages container lifecycle. @@ -65,7 +66,7 @@ public final class WebContainerLifecycle public WebContainerLifecycle() { super(null); - this.logger = WebBeansLogger.getLogger(WebContainerLifecycle.class); + this.logger = WebBeansLoggerFacade.getLogger(WebContainerLifecycle.class); } /** @@ -75,7 +76,7 @@ public final class WebContainerLifecycle public WebContainerLifecycle(WebBeansContext webBeansContext) { super(null, webBeansContext); - this.logger = WebBeansLogger.getLogger(WebContainerLifecycle.class); + this.logger = WebBeansLoggerFacade.getLogger(WebContainerLifecycle.class); } @@ -124,7 +125,7 @@ public final class WebContainerLifecycle //Application is configured as JSP if(getWebBeansContext().getOpenWebBeansConfiguration().isJspApplication()) { - logger.debug("Application is configured as JSP. Adding EL Resolver."); + logger.log(Level.FINE, "Application is configured as JSP. Adding EL Resolver."); JspFactory factory = JspFactory.getDefaultFactory(); if (factory != null) @@ -134,7 +135,7 @@ public final class WebContainerLifecycle } else { - logger.debug("Default JSPFactroy instance has not found"); + logger.log(Level.FINE, "Default JSPFactroy instance has not found"); } } @@ -189,9 +190,9 @@ public final class WebContainerLifecycle this.cleanupShutdownThreadLocals(); - if (logger.wblWillLogInfo()) + if (logger.isLoggable(Level.INFO)) { - logger.info(OWBLogConst.INFO_0002, ServletCompatibilityUtil.getServletInfo(servletContext)); + logger.log(Level.INFO, OWBLogConst.INFO_0002, ServletCompatibilityUtil.getServletInfo(servletContext)); } } @@ -221,7 +222,7 @@ public final class WebContainerLifecycle } else { - throw new WebBeansException(logger.getTokenString(OWBLogConst.EXCEPT_0002)); + throw new WebBeansException(WebBeansLoggerFacade.getTokenString(OWBLogConst.EXCEPT_0002)); } } Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java Mon Jul 16 19:56:23 2012 @@ -21,6 +21,8 @@ package org.apache.webbeans.web.scanner; import java.net.URL; import java.util.HashSet; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.servlet.ServletContext; @@ -29,7 +31,7 @@ import org.apache.webbeans.corespi.scann import org.apache.webbeans.corespi.scanner.AnnotationDB; import org.apache.webbeans.corespi.se.BeansXmlAnnotationDB; import org.apache.webbeans.exception.WebBeansConfigurationException; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.util.WebBeansUtil; import org.scannotation.WarUrlFinder; @@ -38,7 +40,7 @@ import org.scannotation.WarUrlFinder; */ public class WebScannerService extends AbstractMetaDataDiscovery { - private final WebBeansLogger logger = WebBeansLogger.getLogger(WebScannerService.class); + private final Logger logger = WebBeansLoggerFacade.getLogger(WebScannerService.class); private boolean configure = false; @@ -73,7 +75,7 @@ public class WebScannerService extends A } catch (Exception e) { - throw new WebBeansConfigurationException(logger.getTokenString(OWBLogConst.ERROR_0002), e); + throw new WebBeansConfigurationException(WebBeansLoggerFacade.getTokenString(OWBLogConst.ERROR_0002), e); } } @@ -119,16 +121,16 @@ public class WebScannerService extends A fileDir = "file:/" + fileDir; } - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("OpenWebBeans found the following url while doing web scanning: " + fileDir); + logger.log(Level.FINE, "OpenWebBeans found the following url while doing web scanning: " + fileDir); } addPath = "jar:" + fileDir; - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("OpenWebBeans added the following jar based path while doing web scanning: " + + logger.log(Level.FINE, "OpenWebBeans added the following jar based path while doing web scanning: " + addPath); } } @@ -137,9 +139,9 @@ public class WebScannerService extends A //X TODO check! addPath = "file:" + url + "META-INF/beans.xml"; - if (logger.wblWillLogDebug()) + if (logger.isLoggable(Level.FINE)) { - logger.debug("OpenWebBeans added the following file based path while doing web scanning: " + + logger.log(Level.FINE, "OpenWebBeans added the following file based path while doing web scanning: " + addPath); } Modified: openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java?rev=1362228&r1=1362227&r2=1362228&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java (original) +++ openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java Mon Jul 16 19:56:23 2012 @@ -19,7 +19,7 @@ package org.apache.webbeans.web.tests.interceptor; import junit.framework.Assert; -import org.apache.webbeans.logger.WebBeansLogger; +import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.newtests.AbstractUnitTest; import org.apache.webbeans.newtests.interceptors.beans.ApplicationScopedBean; import org.apache.webbeans.newtests.interceptors.beans.RequestScopedBean; @@ -33,6 +33,8 @@ import javax.servlet.ServletRequestEvent import java.util.ArrayList; import java.util.Collection; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; /** * This test checks the performance of simple interceptor invocations. @@ -44,7 +46,7 @@ public class CachedInterceptorHandlerTes private static final int ITERATIONS = 100000; - private static WebBeansLogger logger = WebBeansLogger.getLogger(CachedInterceptorHandlerTest.class); + private static Logger logger = WebBeansLoggerFacade.getLogger(CachedInterceptorHandlerTest.class); @Test @@ -95,7 +97,7 @@ public class CachedInterceptorHandlerTes long end = System.nanoTime(); - logger.info("Executing {0} iterations took {1} ns", ITERATIONS, end - start); + logger.log(Level.INFO, "Executing {0} iterations took {1} ns", WebBeansLoggerFacade.args(ITERATIONS, end - start)); shutDownContainer();
