Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 89276 invoked from network); 28 Sep 2007 19:16:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Sep 2007 19:16:46 -0000 Received: (qmail 51833 invoked by uid 500); 28 Sep 2007 19:16:34 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 51776 invoked by uid 500); 28 Sep 2007 19:16:33 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 51761 invoked by uid 99); 28 Sep 2007 19:16:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2007 12:16:33 -0700 X-ASF-Spam-Status: No, hits=-98.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2007 19:18:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C9C2F1A9832; Fri, 28 Sep 2007 12:16:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r580462 [1/2] - in /incubator/cxf/trunk: buildtools/src/main/resources/ common/common/src/main/java/org/apache/cxf/common/logging/ common/common/src/main/java/org/apache/cxf/common/util/ common/common/src/test/java/org/apache/cxf/common/ann... Date: Fri, 28 Sep 2007 19:15:58 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070928191604.C9C2F1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Sep 28 12:15:55 2007 New Revision: 580462 URL: http://svn.apache.org/viewvc?rev=580462&view=rev Log: Update tests to get loggers through LogUtils Enforce getting loggers through LogUtils with PMD Update Log4jLogger to be a bit faster as well as support a few other methods. Fix generating the eclipse plugin (jdom has classes in default package causeing issues) Modified: incubator/cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset.xml incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIConduitTest.java incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIDestinationTest.java incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterImpl.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterSessionImpl.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jbi/ClientServerTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/AbstractProvider.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/TestProvider.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Modified: incubator/cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset.xml?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset.xml (original) +++ incubator/cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset.xml Fri Sep 28 12:15:55 2007 @@ -187,4 +187,20 @@ + + 2 + Don't use Logger.getLogger(...), use LogUtils.getL7dLogger(....) instead + + + + + + + + + Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java (original) +++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java Fri Sep 28 12:15:55 2007 @@ -18,11 +18,20 @@ */ package org.apache.cxf.common.logging; +import java.util.ArrayList; +import java.util.Enumeration; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; +import org.apache.log4j.Appender; +import org.apache.log4j.AppenderSkeleton; +import org.apache.log4j.Priority; +import org.apache.log4j.spi.LoggingEvent; + /** * java.util.logging.Logger implementation delegating to Log4j. * All methods can be used except: @@ -34,13 +43,10 @@ * @author gnodet */ public class Log4jLogger extends AbstractDelegatingLogger { - private static final Map TO_LOG4J = new HashMap(); - private static final Map FROM_LOG4J = - new HashMap(); - private org.apache.log4j.Logger log; + private final org.apache.log4j.Logger log; static { @@ -53,13 +59,6 @@ TO_LOG4J.put(Level.FINER, org.apache.log4j.Level.TRACE); TO_LOG4J.put(Level.FINEST, org.apache.log4j.Level.TRACE); TO_LOG4J.put(Level.OFF, org.apache.log4j.Level.OFF); - FROM_LOG4J.put(org.apache.log4j.Level.ALL, Level.ALL); - FROM_LOG4J.put(org.apache.log4j.Level.ERROR, Level.SEVERE); - FROM_LOG4J.put(org.apache.log4j.Level.WARN, Level.WARNING); - FROM_LOG4J.put(org.apache.log4j.Level.INFO, Level.INFO); - FROM_LOG4J.put(org.apache.log4j.Level.DEBUG, Level.FINE); - FROM_LOG4J.put(org.apache.log4j.Level.TRACE, Level.FINEST); - FROM_LOG4J.put(org.apache.log4j.Level.OFF, Level.OFF); } public Log4jLogger(String name, String resourceBundleName) { @@ -68,15 +67,35 @@ } public Level getLevel() { - for (org.apache.log4j.Category c = log; c != null; c = c.getParent()) { - org.apache.log4j.Level l = c.getLevel(); - if (l != null) { - return FROM_LOG4J.get(l); - } + org.apache.log4j.Level l = log.getEffectiveLevel(); + if (l != null) { + return fromL4J(l); } return null; } - + + public void setLevel(Level newLevel) throws SecurityException { + log.setLevel(TO_LOG4J.get(newLevel)); + } + + public synchronized void addHandler(Handler handler) throws SecurityException { + log.addAppender(new HandlerWrapper(handler)); + } + public synchronized void removeHandler(Handler handler) throws SecurityException { + log.removeAppender("HandlerWrapper-" + handler.hashCode()); + } + public synchronized Handler[] getHandlers() { + List ret = new ArrayList(); + Enumeration en = log.getAllAppenders(); + while (en.hasMoreElements()) { + Appender ap = (Appender)en.nextElement(); + if (ap instanceof HandlerWrapper) { + ret.add(((HandlerWrapper)ap).getHandler()); + } + } + return ret.toArray(new Handler[ret.size()]); + } + protected void internalLogFormatted(String msg, LogRecord record) { log.log(AbstractDelegatingLogger.class.getName(), TO_LOG4J.get(record.getLevel()), @@ -84,4 +103,98 @@ record.getThrown()); } + + private Level fromL4J(org.apache.log4j.Level l) { + Level l2 = null; + switch (l.toInt()) { + case org.apache.log4j.Level.ALL_INT: + l2 = Level.ALL; + break; + case org.apache.log4j.Level.FATAL_INT: + l2 = Level.SEVERE; + break; + case org.apache.log4j.Level.ERROR_INT: + l2 = Level.SEVERE; + break; + case org.apache.log4j.Level.WARN_INT: + l2 = Level.WARNING; + break; + case org.apache.log4j.Level.INFO_INT: + l2 = Level.INFO; + break; + case org.apache.log4j.Level.DEBUG_INT: + l2 = Level.FINE; + break; + case org.apache.log4j.Level.TRACE_INT: + l2 = Level.FINEST; + break; + case org.apache.log4j.Level.OFF_INT: + l2 = Level.OFF; + break; + default: + l2 = null; + } + return l2; + } + + + private class HandlerWrapper extends AppenderSkeleton { + Handler handler; + + public HandlerWrapper(Handler h) { + handler = h; + name = "HandlerWrapper-" + h.hashCode(); + } + + public Handler getHandler() { + return handler; + } + + @Override + protected void append(LoggingEvent event) { + LogRecord lr = new LogRecord(fromL4J(event.getLevel()), + event.getMessage().toString()); + lr.setLoggerName(event.getLoggerName()); + if (event.getThrowableInformation() != null) { + lr.setThrown(event.getThrowableInformation().getThrowable()); + } + String rbname = getResourceBundleName(); + if (rbname != null) { + lr.setResourceBundleName(rbname); + lr.setResourceBundle(getResourceBundle()); + } + getFullInfoForLogUtils(lr, event.fqnOfCategoryClass); + handler.publish(lr); + } + @Override + public void close() { + handler.close(); + closed = true; + } + @Override + public boolean requiresLayout() { + return false; + } + + @Override + public Priority getThreshold() { + return TO_LOG4J.get(handler.getLevel()); + } + @Override + public boolean isAsSevereAsThreshold(Priority priority) { + Priority p = getThreshold(); + return (p == null) || priority.isGreaterOrEqual(p); + } + } + private static void getFullInfoForLogUtils(LogRecord lr, String cname) { + StackTraceElement el[] = Thread.currentThread().getStackTrace(); + for (int x = el.length - 2; x >= 0; x--) { + if (LogUtils.class.getName().equals(el[x].getClassName()) + || cname.equals(el[x].getClassName())) { + lr.setSourceClassName(el[x + 1].getClassName()); + lr.setSourceMethodName(el[x + 1].getMethodName()); + return; + } + } + } } Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java (original) +++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Fri Sep 28 12:15:55 2007 @@ -19,6 +19,9 @@ package org.apache.cxf.common.logging; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.text.MessageFormat; @@ -29,15 +32,18 @@ import java.util.logging.Logger; import org.apache.cxf.common.i18n.BundleUtils; +import org.apache.cxf.common.util.StringUtils; /** * A container for static utility methods related to logging. */ public final class LogUtils { + public static final String KEY = "org.apache.cxf.Logger"; private static final Object[] NO_PARAMETERS = new Object[0]; + private static Class loggerClass; /** @@ -46,6 +52,31 @@ private LogUtils() { } + static { + try { + String cname = System.getProperty(KEY); + if (StringUtils.isEmpty(cname)) { + InputStream ins = Thread.currentThread().getContextClassLoader() + .getResourceAsStream("META-INF/cxf/" + KEY); + if (ins == null) { + ins = ClassLoader.getSystemResourceAsStream("META-INF/cxf/" + KEY); + } + if (ins != null) { + BufferedReader din = new BufferedReader(new InputStreamReader(ins)); + cname = din.readLine(); + } + } + if (!StringUtils.isEmpty(cname)) { + loggerClass = Class.forName(cname, true, + Thread.currentThread().getContextClassLoader()); + getLogger(LogUtils.class).fine("Using " + loggerClass.getName() + " for logging."); + } + } catch (Exception ex) { + //ignore + } + } + + /** * Enable users to use their own logger implementation. */ @@ -53,6 +84,42 @@ loggerClass = cls; } + + /** + * Get a Logger with the associated default resource bundle for the class. + * + * @param cls the Class to contain the Logger + * @return an appropriate Logger + */ + public static Logger getLogger(Class cls) { + return createLogger(cls, null, cls.getName()); + } + + /** + * Get a Logger with an associated resource bundle. + * + * @param cls the Class to contain the Logger + * @param name the resource name + * @return an appropriate Logger + */ + public static Logger getLogger(Class cls, String resourcename) { + return createLogger(cls, resourcename, cls.getName()); + } + + /** + * Get a Logger with an associated resource bundle. + * + * @param cls the Class to contain the Logger (to find resources) + * @param name the resource name + * @param loggerName the full name for the logger + * @return an appropriate Logger + */ + public static Logger getLogger(Class cls, + String resourcename, + String loggerName) { + return createLogger(cls, resourcename, loggerName); + } + /** * Get a Logger with the associated default resource bundle for the class. * @@ -60,7 +127,7 @@ * @return an appropriate Logger */ public static Logger getL7dLogger(Class cls) { - return createLogger(cls, null); + return createLogger(cls, null, cls.getName()); } /** @@ -70,29 +137,45 @@ * @param name the resource name * @return an appropriate Logger */ - public static Logger getL7dLogger(Class cls, String name) { - return createLogger(cls, name); + public static Logger getL7dLogger(Class cls, String resourcename) { + return createLogger(cls, resourcename, cls.getName()); } /** + * Get a Logger with an associated resource bundle. + * + * @param cls the Class to contain the Logger (to find resources) + * @param name the resource name + * @param loggerName the full name for the logger + * @return an appropriate Logger + */ + public static Logger getL7dLogger(Class cls, + String resourcename, + String loggerName) { + return createLogger(cls, resourcename, loggerName); + } + + /** * Create a logger */ - protected static Logger createLogger(Class cls, String name) { + protected static Logger createLogger(Class cls, + String name, + String loggerName) { if (loggerClass != null) { try { Constructor cns = loggerClass.getConstructor(String.class, String.class); if (name == null) { try { - return (Logger) cns.newInstance(cls.getName(), BundleUtils.getBundleName(cls)); + return (Logger) cns.newInstance(loggerName, BundleUtils.getBundleName(cls)); } catch (InvocationTargetException ite) { if (ite.getTargetException() instanceof MissingResourceException) { - return (Logger) cns.newInstance(cls.getName(), null); + return (Logger) cns.newInstance(loggerName, null); } else { throw ite; } } } else { - return (Logger) cns.newInstance(cls.getName(), BundleUtils.getBundleName(cls, name)); + return (Logger) cns.newInstance(loggerName, BundleUtils.getBundleName(cls, name)); } } catch (Exception e) { throw new RuntimeException(e); @@ -100,12 +183,12 @@ } if (name == null) { try { - return Logger.getLogger(cls.getName(), BundleUtils.getBundleName(cls)); + return Logger.getLogger(loggerName, BundleUtils.getBundleName(cls)); //NOPMD } catch (MissingResourceException rex) { - return Logger.getLogger(cls.getName(), null); + return Logger.getLogger(loggerName, null); //NOPMD } } else { - return Logger.getLogger(cls.getName(), BundleUtils.getBundleName(cls, name)); + return Logger.getLogger(loggerName, BundleUtils.getBundleName(cls, name)); //NOPMD } } Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java (original) +++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java Fri Sep 28 12:15:55 2007 @@ -37,7 +37,8 @@ continue; } String packageName = getPackageName(item); - if (!packageNames.contains(packageName)) { + if (!StringUtils.isEmpty(packageName) + && !packageNames.contains(packageName)) { packageNames.add(packageName); } } @@ -45,6 +46,9 @@ } private static String getPackageName(String clzName) { + if (clzName.indexOf("/") == -1) { + return null; + } String packageName = clzName.substring(0, clzName.lastIndexOf("/")); return packageName.replace("/", "."); } Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java (original) +++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java Fri Sep 28 12:15:55 2007 @@ -31,13 +31,15 @@ import javax.xml.ws.ResponseWrapper; import javax.xml.ws.WebServiceContext; +import org.apache.cxf.common.logging.LogUtils; + @javax.jws.WebService(name = "Greeter", serviceName = "SOAPService", targetNamespace = "http://apache.org/hello_world_soap_http") @HandlerChain(name = "TestHandlerChain", file = "handlers.xml") public class AnnotatedGreeterImpl { private static final Logger LOG = - Logger.getLogger(AnnotatedGreeterImpl.class.getName()); + LogUtils.getL7dLogger(AnnotatedGreeterImpl.class); @Resource private int foo; Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java (original) +++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java Fri Sep 28 12:15:55 2007 @@ -55,6 +55,7 @@ LOG.addHandler(handler); // handler called *before* localization of message LogRecord record = new LogRecord(Level.WARNING, "FOOBAR_MSG"); + record.setResourceBundle(LOG.getResourceBundle()); EasyMock.reportMatcher(new LogRecordMatcher(record)); handler.publish(record); EasyMock.replay(handler); @@ -168,7 +169,12 @@ public boolean matches(Object obj) { if (obj instanceof LogRecord) { LogRecord other = (LogRecord)obj; - return record.getMessage().equals(other.getMessage()) + String l7dString = "NOT-L7D"; + if (record.getResourceBundle() != null) { + l7dString = record.getResourceBundle().getString(record.getMessage()); + } + return (record.getMessage().equals(other.getMessage()) + || l7dString.equals(other.getMessage())) && record.getLevel().equals(other.getLevel()) && record.getThrown() == other.getThrown(); } Modified: incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java (original) +++ incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java Fri Sep 28 12:15:55 2007 @@ -70,8 +70,8 @@ // true if log output is already going somewhere public static boolean loggerInitialisedOutsideConnector() { - final Handler[] handlers = Logger.getLogger("").getHandlers(); - return handlers.length > 0; + final Handler[] handlers = Logger.getLogger("").getHandlers(); //NOPMD + return handlers != null && handlers.length > 0; } static Handler getHandler(Logger log, String handlerName) { @@ -86,14 +86,14 @@ } public static void disableConsoleLogging() { - final Handler handler = getHandler(Logger.getLogger(""), CONSOLE_HANDLER); - Logger.getLogger("").removeHandler(handler); + final Handler handler = getHandler(Logger.getLogger(""), CONSOLE_HANDLER); //NOPMD + Logger.getLogger("").removeHandler(handler); //NOPMD } public static void enableConsoleLogging() { - if (getHandler(Logger.getLogger(""), CONSOLE_HANDLER) == null) { + if (getHandler(Logger.getLogger(""), CONSOLE_HANDLER) == null) { //NOPMD final ConsoleHandler console = new ConsoleHandler(); - Logger.getLogger("").addHandler(console); + Logger.getLogger("").addHandler(console); //NOPMD } } @@ -115,7 +115,7 @@ Logger rootCXFLogger = null; rootCXFLogger = LogManager.getLogManager().getLogger(getRootLoggerName()); if (rootCXFLogger == null) { - rootCXFLogger = Logger.getLogger(getRootLoggerName()); + rootCXFLogger = Logger.getLogger(getRootLoggerName()); //NOPMD } return rootCXFLogger; Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java (original) +++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java Fri Sep 28 12:15:55 2007 @@ -25,6 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.cxf.common.logging.LogUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -32,7 +33,7 @@ public class PlugInClassLoaderTest extends Assert { - private static final Logger LOG = Logger.getLogger(PlugInClassLoaderTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(PlugInClassLoaderTest.class); private static boolean debug; PlugInClassLoader plugInClassLoader; Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java (original) +++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java Fri Sep 28 12:15:55 2007 @@ -23,6 +23,7 @@ import java.util.logging.Handler; import java.util.logging.Logger; +import org.apache.cxf.common.logging.LogUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -43,7 +44,7 @@ @Test public void testEnableDisableConsoleLogging() { - Logger rootLogger = Logger.getLogger(""); + Logger rootLogger = LogUtils.getLogger(this.getClass(), null, ""); Handler handler; /*Handler handler = LoggerHelper.getHandler(rootLogger, LoggerHelper.CONSOLE_HANDLER); @@ -52,7 +53,7 @@ LoggerHelper.enableConsoleLogging(); handler = LoggerHelper.getHandler(rootLogger, LoggerHelper.CONSOLE_HANDLER); - assertNotNull("default console appender is there", handler); + assertNotNull("default console appender is not there", handler); LoggerHelper.disableConsoleLogging(); @@ -65,8 +66,9 @@ LoggerHelper.setRootLoggerName(TEST_LOGGER_NAME); LoggerHelper.setLogLevel("INFO"); assertEquals("incorrect log level", "INFO", LoggerHelper.getLogLevel()); - assertEquals("log level not set on IONA logger", "INFO", Logger.getLogger(TEST_LOGGER_NAME) - .getLevel().toString()); + assertEquals("log level not set on IONA logger", "INFO", + LogUtils.getLogger(this.getClass(), null, TEST_LOGGER_NAME) + .getLevel().toString()); } @Test Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java (original) +++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java Fri Sep 28 12:15:55 2007 @@ -21,6 +21,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.cxf.common.logging.LogUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -29,7 +30,7 @@ public class ResourceAdapterInternalExceptionTest extends Assert { private static final Logger EXCEPTION_LOGGER = - Logger.getLogger(ResourceAdapterInternalException.class.getName()); + LogUtils.getLogger(ResourceAdapterInternalException.class); private Level logLevel; @Before Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java (original) +++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java Fri Sep 28 12:15:55 2007 @@ -22,6 +22,7 @@ import java.util.Map; import java.util.logging.Logger; +import org.apache.cxf.common.logging.LogUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -29,7 +30,7 @@ public class JarLoaderTest extends Assert { - private static final Logger LOG = Logger.getLogger(JarLoaderTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(JarLoaderTest.class); private URL exampleRarURL; Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java (original) +++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java Fri Sep 28 12:15:55 2007 @@ -42,6 +42,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.binding.BindingFactoryManager; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.transport.DestinationFactory; @@ -57,7 +58,7 @@ public class ServiceWSDLBuilderTest extends Assert { - private static final Logger LOG = Logger.getLogger(ServiceWSDLBuilderTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(ServiceWSDLBuilderTest.class); private static final String WSDL_PATH = "hello_world.wsdl"; private Definition def; Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original) +++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Fri Sep 28 12:15:55 2007 @@ -44,6 +44,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.binding.BindingFactoryManager; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.XMLUtils; import org.apache.cxf.service.model.BindingFaultInfo; @@ -71,7 +72,7 @@ public class WSDLServiceBuilderTest extends Assert { // TODO: reuse the wsdl in testutils and add the parameter order into one of the wsdl - private static final Logger LOG = Logger.getLogger(WSDLServiceBuilderTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(WSDLServiceBuilderTest.class); private static final String WSDL_PATH = "hello_world.wsdl"; private static final String BARE_WSDL_PATH = "hello_world_bare.wsdl"; private static final String IMPORT_WSDL_PATH = "hello_world_schema_import.wsdl"; Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java (original) +++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java Fri Sep 28 12:15:55 2007 @@ -43,6 +43,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.binding.BindingFactoryManager; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.databinding.DataReader; import org.apache.cxf.databinding.DataWriter; import org.apache.cxf.helpers.CastUtils; @@ -63,7 +64,7 @@ public class JAXBDataBindingTest extends Assert { - private static final Logger LOG = Logger.getLogger(JAXBDataBindingTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(JAXBDataBindingTest.class); private static final String WSDL_PATH = "/wsdl/hello_world.wsdl"; private Definition def; private Service service; Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Fri Sep 28 12:15:55 2007 @@ -1757,7 +1757,7 @@ // If this is a GET method we must not touch the output // stream as this automagically turns the reqest into a POST. - if (connection.getRequestMethod().equals("GET")) { + if ("GET".equals(connection.getRequestMethod())) { return; } Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java Fri Sep 28 12:15:55 2007 @@ -361,6 +361,9 @@ EasyMock.expectLastCall().andReturn("POST"); connection.setChunkedStreamingMode(-1); EasyMock.expectLastCall(); + } else { + connection.getRequestMethod(); + EasyMock.expectLastCall().andReturn("POST").anyTimes(); } connection.setConnectTimeout(303030); @@ -537,7 +540,7 @@ message.getContentFormats().contains(OutputStream.class)); connection.getRequestMethod(); - EasyMock.expectLastCall().andReturn("POST"); + EasyMock.expectLastCall().andReturn("POST").anyTimes(); os = EasyMock.createMock(OutputStream.class); connection.getOutputStream(); @@ -578,7 +581,7 @@ ResponseDelimiter delimiter, boolean emptyResponse) throws IOException { connection.getHeaderFields(); - EasyMock.expectLastCall().andReturn(Collections.EMPTY_MAP); + EasyMock.expectLastCall().andReturn(Collections.EMPTY_MAP).anyTimes(); int responseCode = style == ResponseStyle.BACK_CHANNEL ? HttpURLConnection.HTTP_OK : HttpURLConnection.HTTP_ACCEPTED; @@ -593,7 +596,7 @@ connection.getContentLength(); if (delimiter == ResponseDelimiter.CHUNKED || delimiter == ResponseDelimiter.EOF) { - EasyMock.expectLastCall().andReturn(-1); + EasyMock.expectLastCall().andReturn(-1).anyTimes(); if (delimiter == ResponseDelimiter.CHUNKED) { connection.getHeaderField("Transfer-Encoding"); EasyMock.expectLastCall().andReturn("chunked"); @@ -604,7 +607,7 @@ is.read(); EasyMock.expectLastCall().andReturn(emptyResponse ? -1 : (int)'<'); } else { - EasyMock.expectLastCall().andReturn(123); + EasyMock.expectLastCall().andReturn(123).anyTimes(); } if (emptyResponse) { is.close(); Modified: incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIConduitTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIConduitTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIConduitTest.java (original) +++ incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIConduitTest.java Fri Sep 28 12:15:55 2007 @@ -34,6 +34,7 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.ExchangeImpl; import org.apache.cxf.message.Message; @@ -45,7 +46,7 @@ import org.junit.Test; public class JBIConduitTest extends AbstractJBITest { - static final Logger LOG = Logger.getLogger(JBIDestinationTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(JBIDestinationTest.class); @Test Modified: incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIDestinationTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIDestinationTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIDestinationTest.java (original) +++ incubator/cxf/trunk/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIDestinationTest.java Fri Sep 28 12:15:55 2007 @@ -21,10 +21,11 @@ import java.util.logging.Logger; +import org.apache.cxf.common.logging.LogUtils; import org.junit.Test; public class JBIDestinationTest extends AbstractJBITest { - static final Logger LOG = Logger.getLogger(JBIDestinationTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(JBIDestinationTest.class); @Test public void testDestination() throws Exception { LOG.info("JBI destination test"); Modified: incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original) +++ incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Fri Sep 28 12:15:55 2007 @@ -63,7 +63,10 @@ public static final String SIGNATURE_RESULT = "wss4j.signature.result"; private static final Logger LOG = LogUtils.getL7dLogger(WSS4JInInterceptor.class); - private static final Logger TIME_LOG = Logger.getLogger(WSS4JInInterceptor.class.getName() + "-Time"); + private static final Logger TIME_LOG = LogUtils.getL7dLogger(WSS4JInInterceptor.class, + null, + WSS4JInInterceptor.class.getName() + + "-Time"); public WSS4JInInterceptor() { super(); Modified: incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java (original) +++ incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java Fri Sep 28 12:15:55 2007 @@ -31,6 +31,7 @@ import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.SoapVersion; import org.apache.cxf.common.i18n.Message; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.phase.Phase; import org.apache.ws.security.WSConstants; @@ -40,11 +41,13 @@ import org.apache.ws.security.util.WSSecurityUtil; public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor { - private static final Logger LOG = Logger - .getLogger(WSS4JOutInterceptor.class.getName()); + private static final Logger LOG = LogUtils + .getL7dLogger(WSS4JOutInterceptor.class); - private static final Logger TIME_LOG = Logger - .getLogger(WSS4JOutInterceptor.class.getName() + "-Time"); + private static final Logger TIME_LOG = LogUtils + .getL7dLogger(WSS4JOutInterceptor.class, + null, + WSS4JOutInterceptor.class.getName() + "-Time"); public WSS4JOutInterceptor() { super(); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import org.apache.cxf.aegis.databinding.AegisDatabinding; import org.apache.cxf.authservice.AuthService; import org.apache.cxf.authservice.Authenticate; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; @@ -33,7 +34,7 @@ import org.junit.Test; public class AegisClientServerTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(AegisClientServerTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(AegisClientServerTest.class); @BeforeClass public static void startServers() throws Exception { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java Fri Sep 28 12:15:55 2007 @@ -30,6 +30,7 @@ import javax.xml.ws.Endpoint; import javax.xml.ws.Response; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.Control; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.types.FaultLocation; @@ -43,7 +44,7 @@ targetNamespace = "http://cxf.apache.org/greeter_control") public class ControlImpl implements Control { - private static final Logger LOG = Logger.getLogger(ControlImpl.class.getName()); + private static final Logger LOG = LogUtils.getLogger(ControlImpl.class); private Map implementors; private Map endpoints; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java Fri Sep 28 12:15:55 2007 @@ -30,6 +30,7 @@ import org.apache.cxf.clustering.FailoverTargetSelector; import org.apache.cxf.clustering.RandomStrategy; import org.apache.cxf.clustering.SequentialStrategy; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.ConduitSelector; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.frontend.ClientProxy; @@ -62,7 +63,7 @@ protected static final String REPLICA_D = "http://localhost:9054/SoapContext/ReplicatedPortD"; private static final Logger LOG = - Logger.getLogger(FailoverTest.class.getName()); + LogUtils.getLogger(FailoverTest.class); private static final String FAILOVER_CONFIG = "org/apache/cxf/systest/clustering/failover.xml"; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java Fri Sep 28 12:15:55 2007 @@ -27,6 +27,7 @@ import javax.xml.ws.handler.MessageContext; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.handler_test.PingException; @@ -41,7 +42,7 @@ */ public abstract class TestHandlerBase { - private static final Logger LOG = Logger.getLogger(TestHandlerBase.class.getName()); + private static final Logger LOG = LogUtils.getLogger(TestHandlerBase.class); private static int sid; private static int sinvokedOrder; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterImpl.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterImpl.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterImpl.java Fri Sep 28 12:15:55 2007 @@ -23,6 +23,7 @@ import javax.jws.WebService; +import org.apache.cxf.common.logging.LogUtils; import org.apache.hello_world.Greeter; @@ -32,7 +33,9 @@ public class GreeterImpl implements Greeter { private static final Logger LOG = - Logger.getLogger(GreeterImpl.class.getPackage().getName()); + LogUtils.getLogger(GreeterImpl.class, + null, + GreeterImpl.class.getPackage().getName()); private String myName; public GreeterImpl() { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterSessionImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterSessionImpl.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterSessionImpl.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/GreeterSessionImpl.java Fri Sep 28 12:15:55 2007 @@ -31,6 +31,7 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.types.GreetMeResponse; import org.apache.cxf.greeter_control.types.PingMeResponse; @@ -42,7 +43,9 @@ targetNamespace = "http://cxf.apache.org/greeter_control") public class GreeterSessionImpl implements Greeter { private static final Logger LOG = - Logger.getLogger(GreeterSessionImpl.class.getPackage().getName()); + LogUtils.getLogger(GreeterSessionImpl.class, + null, + GreeterSessionImpl.class.getPackage().getName()); @Resource private WebServiceContext context; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java Fri Sep 28 12:15:55 2007 @@ -33,6 +33,7 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.greeter_control.Control; @@ -60,7 +61,7 @@ * */ public class InterceptorFaultTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(InterceptorFaultTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(InterceptorFaultTest.class); private static final QName SOAP_FAULT_CODE = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Server"); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java Fri Sep 28 12:15:55 2007 @@ -32,6 +32,7 @@ +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.hello_world_soap_http.any.Greeter; @@ -43,7 +44,7 @@ public final class AnyClientServerTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(AnyClientServerTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(AnyClientServerTest.class); private final QName serviceName = new QName("http://apache.org/hello_world_soap_http/any", "SOAPService"); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Fri Sep 28 12:15:55 2007 @@ -53,6 +53,7 @@ //import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.Soap11; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.dynamic.DynamicClientFactory; @@ -77,7 +78,7 @@ public class ClientServerTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(ClientServerTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(ClientServerTest.class); private final QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService"); private final QName portName = new QName("http://apache.org/hello_world_soap_http", Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import javax.xml.ws.Endpoint; import javax.xml.ws.Holder; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; @@ -38,7 +39,7 @@ public class LocatorClientServerTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(LocatorClientServerTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(LocatorClientServerTest.class); private final QName serviceName = new QName("http://apache.org/locator", "LocatorService"); public static class MyServer extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jbi/ClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jbi/ClientServerTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jbi/ClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jbi/ClientServerTest.java Fri Sep 28 12:15:55 2007 @@ -29,6 +29,7 @@ import javax.xml.ws.Endpoint; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.jaxws.EndpointImpl; @@ -50,7 +51,7 @@ public class ClientServerTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(ClientServerTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(ClientServerTest.class); private final QName serviceName = new QName( "http://apache.org/hello_world/jbi", "HelloWorldService"); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java Fri Sep 28 12:15:55 2007 @@ -28,6 +28,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Endpoint; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.systest.jms.EmbeddedJMSBrokerLauncher; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; @@ -40,7 +41,7 @@ import org.junit.Test; public class MultiTransportClientServerTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(MultiTransportClientServerTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(MultiTransportClientServerTest.class); private final QName serviceName = new QName( "http://apache.org/hello_world_doc_lit", "MultiTransportService"); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/AbstractProvider.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/AbstractProvider.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/AbstractProvider.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/AbstractProvider.java Fri Sep 28 12:15:55 2007 @@ -26,8 +26,10 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.http.HTTPBinding; +import org.apache.cxf.common.logging.LogUtils; + public abstract class AbstractProvider implements WebProvider { - static final Logger LOG = Logger.getLogger(AbstractProvider.class.getName()); + static final Logger LOG = LogUtils.getLogger(AbstractProvider.class); protected WebServiceContext wsContext; public T invoke(T req) { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java Fri Sep 28 12:15:55 2007 @@ -39,6 +39,7 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.junit.Before; @@ -47,7 +48,7 @@ public class DataSourceProviderTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(DataSourceProviderTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(DataSourceProviderTest.class); private static final String BOUNDARY = "----=_Part_4_701508.1145579811786"; private HttpURLConnection conn; private URL url; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/TestProvider.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/TestProvider.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/TestProvider.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/datasource/TestProvider.java Fri Sep 28 12:15:55 2007 @@ -35,6 +35,7 @@ import javax.xml.ws.WebServiceContext; import javax.xml.ws.WebServiceProvider; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.IOUtils; @@ -45,7 +46,7 @@ @ServiceMode(value = Service.Mode.MESSAGE) public class TestProvider extends AbstractProvider implements Provider { - static final Logger LOG = Logger.getLogger(TestProvider.class.getName()); + static final Logger LOG = LogUtils.getLogger(TestProvider.class); @javax.annotation.Resource public void setWebServiceContext(WebServiceContext wsc) { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java Fri Sep 28 12:15:55 2007 @@ -29,6 +29,7 @@ import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.cxf.binding.http.HttpBindingFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.customer.book.Book; import org.apache.cxf.customer.book.BookService; import org.apache.cxf.customer.book.BookServiceWrapped; @@ -43,7 +44,7 @@ public class RestClientServerBookTest extends AbstractBusClientServerTestBase { - static final Logger LOG = Logger.getLogger(RestClientServerBookTest.class.getName()); + static final Logger LOG = LogUtils.getLogger(RestClientServerBookTest.class); @BeforeClass public static void startServers() throws Exception { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java Fri Sep 28 12:15:55 2007 @@ -20,6 +20,8 @@ package org.apache.cxf.systest.soap12; import java.util.logging.Logger; + +import org.apache.cxf.common.logging.LogUtils; import org.apache.hello_world_soap12_http.Greeter; import org.apache.hello_world_soap12_http.PingMeFault; import org.apache.hello_world_soap12_http.types.FaultDetail; @@ -31,8 +33,7 @@ public class GreeterImpl implements Greeter { - private static final Logger LOG = - Logger.getLogger(GreeterImpl.class.getPackage().getName()); + private static final Logger LOG = LogUtils.getLogger(GreeterImpl.class); /* (non-Javadoc) * @see org.apache.hello_world_soap12_http.Greeter#sayHi() Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java Fri Sep 28 12:15:55 2007 @@ -27,6 +27,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.greeter_control.BasicGreeterService; @@ -51,7 +52,7 @@ */ public class AddressingInlinePolicyTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(AddressingInlinePolicyTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(AddressingInlinePolicyTest.class); public static class Server extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.BasicGreeterService; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.PingMeFault; @@ -51,7 +52,7 @@ */ public class AddressingOptionalPolicyTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(AddressingOptionalPolicyTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(AddressingOptionalPolicyTest.class); public static class Server extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.BasicGreeterService; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.PingMeFault; @@ -44,7 +45,7 @@ */ public class AddressingPolicyTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(AddressingPolicyTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(AddressingPolicyTest.class); public static class Server extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java Fri Sep 28 12:15:55 2007 @@ -30,6 +30,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.BasicGreeterService; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.PingMeFault; @@ -55,7 +56,7 @@ */ public class HTTPClientPolicyTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(HTTPClientPolicyTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(HTTPClientPolicyTest.class); public static class Server extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java Fri Sep 28 12:15:55 2007 @@ -27,6 +27,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.BasicGreeterService; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.PingMeFault; @@ -50,7 +51,7 @@ */ public class HTTPServerPolicyTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(HTTPServerPolicyTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(HTTPServerPolicyTest.class); public static class Server extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java Fri Sep 28 12:15:55 2007 @@ -24,6 +24,7 @@ import java.util.logging.Logger; import org.apache.cxf.Bus; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.interceptor.Fault; @@ -41,7 +42,7 @@ public class PolicyLoggingInterceptor extends AbstractPhaseInterceptor { - private static final Logger LOG = Logger.getLogger(PolicyLoggingInterceptor.class.getName()); + private static final Logger LOG = LogUtils.getLogger(PolicyLoggingInterceptor.class); private Bus bus; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.BasicGreeterService; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.PingMeFault; @@ -51,7 +52,7 @@ */ public class RMPolicyTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(RMPolicyTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(RMPolicyTest.class); private static final String GREETMEONEWAY_ACTION = null; private static final String GREETME_ACTION = null; private static final String GREETME_RESPONSE_ACTION = null; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.PingMeFault; import org.apache.cxf.greeter_control.ReliableGreeterService; @@ -52,7 +53,7 @@ */ public class RMPolicyWsdlTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(RMPolicyWsdlTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(RMPolicyWsdlTest.class); private static final String GREETMEONEWAY_ACTION = null; private static final String GREETME_ACTION = null; private static final String GREETME_RESPONSE_ACTION = null; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java Fri Sep 28 12:15:55 2007 @@ -28,6 +28,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.greeter_control.Greeter; @@ -61,7 +62,7 @@ public static final String GREETMEONEWAY_ACTION = null; public static final String GREETME_ACTION = null; - private static final Logger LOG = Logger.getLogger(ClientPersistenceTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(ClientPersistenceTest.class); private Greeter greeter; private OutMessageRecorder out; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Fri Sep 28 12:15:55 2007 @@ -27,6 +27,7 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.interceptor.Interceptor; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; @@ -37,7 +38,7 @@ targetNamespace = "http://cxf.apache.org/greeter_control") public class ControlImpl extends org.apache.cxf.greeter_control.ControlImpl { - private static final Logger LOG = Logger.getLogger(ControlImpl.class.getName()); + private static final Logger LOG = LogUtils.getLogger(ControlImpl.class); @Override public boolean startGreeter(String cfgResource) { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java Fri Sep 28 12:15:55 2007 @@ -27,6 +27,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.systest.ws.util.ConnectionHelper; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; @@ -44,7 +45,7 @@ */ public class DecoupledBareTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(DecoupledBareTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(DecoupledBareTest.class); public static class Server extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.GreeterService; import org.apache.cxf.interceptor.LoggingInInterceptor; @@ -43,7 +44,7 @@ */ public class DecoupledClientServerTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(DecoupledClientServerTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(DecoupledClientServerTest.class); private Bus bus; public static class Server extends AbstractBusTestServerBase { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java Fri Sep 28 12:15:55 2007 @@ -26,6 +26,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.interceptor.InterceptorChain; import org.apache.cxf.interceptor.MessageSenderInterceptor; @@ -43,7 +44,7 @@ */ public class MessageLossSimulator extends AbstractPhaseInterceptor { - private static final Logger LOG = Logger.getLogger(MessageLossSimulator.class.getName()); + private static final Logger LOG = LogUtils.getLogger(MessageLossSimulator.class); private int appMessageCount; public MessageLossSimulator() { Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Fri Sep 28 12:15:55 2007 @@ -33,6 +33,7 @@ import org.apache.cxf.binding.soap.Soap11; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.greeter_control.Control; @@ -70,7 +71,7 @@ */ public class SequenceTest extends AbstractBusClientServerTestBase { - private static final Logger LOG = Logger.getLogger(SequenceTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(SequenceTest.class); // private static final String APP_NAMESPACE ="http://celtix.objectweb.org/greeter_control"; // private static final String GREETMEONEWAY_ACTION = APP_NAMESPACE + // "/types/Greeter/greetMeOneWay"; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=580462&r1=580461&r2=580462&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Fri Sep 28 12:15:55 2007 @@ -27,6 +27,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.greeter_control.Control; @@ -56,7 +57,7 @@ public static final String GREETMEONEWAY_ACTION = null; public static final String GREETME_ACTION = null; - private static final Logger LOG = Logger.getLogger(ServerPersistenceTest.class.getName()); + private static final Logger LOG = LogUtils.getLogger(ServerPersistenceTest.class); private static final String CFG = "/org/apache/cxf/systest/ws/rm/persistent.xml"; private static final String SERVER_LOSS_CFG = "/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml";