Repository: ode Updated Branches: refs/heads/ode-1.3.x a91689421 -> 5e73553c9
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/jbi/src/test/resources/log4j2.xml b/jbi/src/test/resources/log4j2.xml new file mode 100644 index 0000000..21313ee --- /dev/null +++ b/jbi/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ +<Configuration> + <Appenders> + <File name="FILE" fileName="target/test/test.log" append="false"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </File> + <Console name="STDOUT" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </Console> + <Async name="Async"> + <AppenderRef ref="FILE"/> + <AppenderRef ref="STDOUT"/> + </Async> + </Appenders> + + <Loggers> + <Logger name="org.apache.ode" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.axis2" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.hibernate" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.openjpa" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.springframework" level="error" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + + <Root level="info"> + <AppenderRef ref="Async"/> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jca-server/src/main/java/org/apache/ode/jca/server/rmi/RmiTransportServerImpl.java ---------------------------------------------------------------------- diff --git a/jca-server/src/main/java/org/apache/ode/jca/server/rmi/RmiTransportServerImpl.java b/jca-server/src/main/java/org/apache/ode/jca/server/rmi/RmiTransportServerImpl.java index 89f0f40..96a8bd6 100644 --- a/jca-server/src/main/java/org/apache/ode/jca/server/rmi/RmiTransportServerImpl.java +++ b/jca-server/src/main/java/org/apache/ode/jca/server/rmi/RmiTransportServerImpl.java @@ -26,8 +26,8 @@ import java.rmi.server.UnicastRemoteObject; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.jca.server.ConnectionProvider; import org.apache.ode.ra.transports.rmi.OdeRemote; import org.apache.ode.ra.transports.rmi.OdeTransportPipeRemote; @@ -37,7 +37,7 @@ import org.apache.ode.ra.transports.rmi.OdeTransportPipeRemote; * "pipes", each represented by its own remote object. */ public class RmiTransportServerImpl implements OdeRemote { - private static final Log __log = LogFactory.getLog(RmiTransportServerImpl.class); + private static final Logger __log = LoggerFactory.getLogger(RmiTransportServerImpl.class); private List<RmiPipeServerImpl> _pipes = new ArrayList<RmiPipeServerImpl>(); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java ---------------------------------------------------------------------- diff --git a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java index 6672e8d..c8bb2f3 100644 --- a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java +++ b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java @@ -36,8 +36,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.bpel.iapi.Scheduler; import org.apache.ode.bpel.iapi.Scheduler.JobDetails; import org.apache.ode.utils.DbIsolation; @@ -51,7 +51,7 @@ import org.apache.ode.utils.StreamUtils; */ public class JdbcDelegate implements DatabaseDelegate { - private static final Log __log = LogFactory.getLog(JdbcDelegate.class); + private static final Logger __log = LoggerFactory.getLogger(JdbcDelegate.class); private static final String DELETE_JOB = "delete from ODE_JOB where jobid = ? and nodeid = ?"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java ---------------------------------------------------------------------- diff --git a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java index e739eb3..af1059b 100644 --- a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java +++ b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java @@ -24,8 +24,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.utils.stl.CollectionsX; import org.apache.ode.utils.stl.MemberOfFunction; @@ -38,7 +38,7 @@ import org.apache.ode.utils.stl.MemberOfFunction; */ class SchedulerThread implements Runnable { - private static final Log __log = LogFactory.getLog(SchedulerThread.class); + private static final Logger __log = LoggerFactory.getLogger(SchedulerThread.class); private static final int TODO_QUEUE_INITIAL_CAPACITY = 200; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java ---------------------------------------------------------------------- diff --git a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java index 7438f9f..450cb73 100644 --- a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java +++ b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java @@ -41,8 +41,8 @@ import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.bpel.iapi.ContextException; import org.apache.ode.bpel.iapi.Scheduler; @@ -67,7 +67,7 @@ import org.apache.ode.bpel.iapi.Scheduler; * */ public class SimpleScheduler implements Scheduler, TaskRunner { - private static final Log __log = LogFactory.getLog(SimpleScheduler.class); + private static final Logger __log = LoggerFactory.getLogger(SimpleScheduler.class); private static final int DEFAULT_TRANSACTION_TIMEOUT = 60 * 1000; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java ---------------------------------------------------------------------- diff --git a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java index b9f173d..89b90c5 100644 --- a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java +++ b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java @@ -20,8 +20,8 @@ package org.apache.ode.scheduler.simple; import org.apache.ode.bpel.iapi.Scheduler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.geronimo.transaction.manager.GeronimoTransactionManager; import javax.transaction.TransactionManager; @@ -34,7 +34,7 @@ import junit.framework.TestCase; * @author Matthieu Riou <[email protected]> */ public class RetriesTest extends TestCase implements Scheduler.JobProcessor { - private static final Log __log = LogFactory.getLog(RetriesTest.class); + private static final Logger __log = LoggerFactory.getLogger(RetriesTest.class); DelegateSupport _ds; SimpleScheduler _scheduler; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/scheduler-simple/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/scheduler-simple/src/test/resources/log4j2.xml b/scheduler-simple/src/test/resources/log4j2.xml new file mode 100644 index 0000000..21313ee --- /dev/null +++ b/scheduler-simple/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ +<Configuration> + <Appenders> + <File name="FILE" fileName="target/test/test.log" append="false"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </File> + <Console name="STDOUT" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </Console> + <Async name="Async"> + <AppenderRef ref="FILE"/> + <AppenderRef ref="STDOUT"/> + </Async> + </Appenders> + + <Loggers> + <Logger name="org.apache.ode" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.axis2" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.hibernate" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.openjpa" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.springframework" level="error" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + + <Root level="info"> + <AppenderRef ref="Async"/> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/tools/src/main/java/org/apache/ode/tools/ClineCommandContext.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/ode/tools/ClineCommandContext.java b/tools/src/main/java/org/apache/ode/tools/ClineCommandContext.java index eb42c97..9642e9f 100644 --- a/tools/src/main/java/org/apache/ode/tools/ClineCommandContext.java +++ b/tools/src/main/java/org/apache/ode/tools/ClineCommandContext.java @@ -18,13 +18,13 @@ */ package org.apache.ode.tools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; public class ClineCommandContext implements CommandContext { - private Log _log; + private Logger _log; - public ClineCommandContext(Log l) { + public ClineCommandContext(Logger l) { _log = l; } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/tools/src/main/java/org/apache/ode/tools/CommandContext.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/ode/tools/CommandContext.java b/tools/src/main/java/org/apache/ode/tools/CommandContext.java index 066feaf..b3ffec9 100644 --- a/tools/src/main/java/org/apache/ode/tools/CommandContext.java +++ b/tools/src/main/java/org/apache/ode/tools/CommandContext.java @@ -52,46 +52,46 @@ public interface CommandContext { public void errln(String s); /** - * Log an error. + * Logger an error. * @param s a descriptive message. */ public void error(String s); /** - * Log an error that resulted from a {@link Throwable}. + * Logger an error that resulted from a {@link Throwable}. * @param s a descriptive message. * @param t the cause. */ public void error(String s, Throwable t); /** - * Log a warning that resulted from a {@link Throwable} + * Logger a warning that resulted from a {@link Throwable} * @param s * @param t */ public void warn(String s, Throwable t); /** - * Log a warning. + * Logger a warning. * @param s a descriptive message. */ public void warn(String s); /** - * Log an informative message. + * Logger an informative message. * @param s a descriptive message. */ public void info(String s); /** - * Log an informative message that resulted from a {@link Throwable}. + * Logger an informative message that resulted from a {@link Throwable}. * @param s a descriptive message. * @param t the cause. */ public void info(String s, Throwable t); /** - * Log a debug-level message that resulted from a {@link Throwable}. + * Logger a debug-level message that resulted from a {@link Throwable}. * @param s a descriptive message. * @param t the cause. */ @@ -99,7 +99,7 @@ public interface CommandContext { public void debug(String s, Throwable t); /** - * Log an debug-level message. + * Logger an debug-level message. * @param s a descriptive message. */ public void debug(String s); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java b/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java index 54ac8ff..3e008fa 100644 --- a/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java +++ b/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java @@ -18,8 +18,8 @@ */ package org.apache.ode.tools.bpelc.cline; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.tools.ClineCommandContext; import org.apache.ode.tools.ExecutionException; import org.apache.ode.tools.bpelc.BpelCompileCommand; @@ -33,7 +33,7 @@ import org.apache.ode.utils.cli.MultiArgument; import java.io.File; public class BpelC extends BaseCommandlineTool { - private static final Log __log = LogFactory.getLog(BpelC.class); + private static final Logger __log = LoggerFactory.getLogger(BpelC.class); private static FlagWithArgument OUTPUT_DIR = new FlagWithArgument("od","directory", "output directory",true); @@ -104,7 +104,7 @@ public class BpelC extends BaseCommandlineTool { // This is really quite unexpected, so we should // print the stack trace to stderr. consoleErr(t.getMessage()); - __log.error(t); + __log.error("",t); System.exit(-2); } System.exit(0); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/DOMUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/DOMUtils.java b/utils/src/main/java/org/apache/ode/utils/DOMUtils.java index d8714c3..2f3622a 100644 --- a/utils/src/main/java/org/apache/ode/utils/DOMUtils.java +++ b/utils/src/main/java/org/apache/ode/utils/DOMUtils.java @@ -50,8 +50,8 @@ import javax.xml.transform.stream.StreamSource; import net.sf.saxon.om.Name11Checker; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.utils.sax.LoggingErrorHandler; import org.apache.xerces.dom.DOMOutputImpl; import org.apache.xerces.impl.Constants; @@ -77,7 +77,7 @@ import org.xml.sax.SAXException; */ public class DOMUtils { - private static Log __log = LogFactory.getLog(DOMUtils.class); + private static Logger __log = LoggerFactory.getLogger(DOMUtils.class); /** The namespaceURI represented by the prefix <code>xmlns</code>. */ public static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";; @@ -1041,7 +1041,7 @@ public class DOMUtils { txer = _transformerFactory.newTransformer(); } catch (TransformerConfigurationException e) { String errmsg = "Transformer configuration error!"; - __log.fatal(errmsg, e); + __log.error(errmsg, e); throw new Error(errmsg, e); } } @@ -1058,7 +1058,7 @@ public class DOMUtils { builder = __documentBuilderFactory.newDocumentBuilder(); builder.setErrorHandler(new LoggingErrorHandler()); } catch (ParserConfigurationException e) { - __log.error(e); + __log.error("",e); throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/DbIsolation.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/DbIsolation.java b/utils/src/main/java/org/apache/ode/utils/DbIsolation.java index b60fe6f..74a7340 100644 --- a/utils/src/main/java/org/apache/ode/utils/DbIsolation.java +++ b/utils/src/main/java/org/apache/ode/utils/DbIsolation.java @@ -23,14 +23,14 @@ import java.sql.Connection; import java.sql.SQLException; import javax.sql.DataSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utility to set Ode-specific isolation level on DataSource connections. */ public class DbIsolation { - private static final Log __log = LogFactory.getLog(DbIsolation.class); + private static final Logger __log = LoggerFactory.getLogger(DbIsolation.class); private static int _isolationLevel; // Read Ode-specific isolation level configuration http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/HierarchicalProperties.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/HierarchicalProperties.java b/utils/src/main/java/org/apache/ode/utils/HierarchicalProperties.java index b393f95..2ae9e4b 100644 --- a/utils/src/main/java/org/apache/ode/utils/HierarchicalProperties.java +++ b/utils/src/main/java/org/apache/ode/utils/HierarchicalProperties.java @@ -20,8 +20,8 @@ package org.apache.ode.utils; import org.apache.commons.collections.map.MultiKeyMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.commons.lang.StringUtils; import javax.xml.namespace.QName; @@ -80,7 +80,7 @@ import java.util.regex.Pattern; */ public class HierarchicalProperties { - private static final Log log = LogFactory.getLog(HierarchicalProperties.class); + private static final Logger log = LoggerFactory.getLogger(HierarchicalProperties.class); public static final String ODE_PREFFIX = "ode"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java b/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java index 988e389..7f2c22c 100644 --- a/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java +++ b/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java @@ -29,7 +29,7 @@ import java.util.*; import javax.sql.DataSource; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; public class LoggingInterceptor<T> implements InvocationHandler { @@ -54,13 +54,13 @@ public class LoggingInterceptor<T> implements InvocationHandler { PARAMSTYPES.add("setURL"); } - private Log _log; + private Logger _log; private T _delegate; private Map<String, Object> _paramsByName = new TreeMap<String, Object>(); private Map<Integer, Object> _paramsByIdx = new TreeMap<Integer, Object>(); - public LoggingInterceptor(T delegate, Log log) { + public LoggingInterceptor(T delegate, Logger log) { _log = log; _delegate = delegate; } @@ -164,7 +164,7 @@ public class LoggingInterceptor<T> implements InvocationHandler { else System.out.println(str); } - public static DataSource createLoggingDS(DataSource ds, Log log) { + public static DataSource createLoggingDS(DataSource ds, Logger log) { return (DataSource)Proxy.newProxyInstance(ds.getClass().getClassLoader(), new Class[] {DataSource.class}, new LoggingInterceptor<DataSource>(ds,log)); } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/NSContext.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/NSContext.java b/utils/src/main/java/org/apache/ode/utils/NSContext.java index 0110aab..c1ad02f 100644 --- a/utils/src/main/java/org/apache/ode/utils/NSContext.java +++ b/utils/src/main/java/org/apache/ode/utils/NSContext.java @@ -34,8 +34,8 @@ import java.util.Set; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.utils.stl.CollectionsX; import org.apache.ode.utils.stl.CompositeUnaryFunction; import org.apache.ode.utils.stl.EqualsUnaryFunction; @@ -54,7 +54,7 @@ public class NSContext implements NamespaceContext, Externalizable { private static final long serialVersionUID = 1L; /** Class-level logger. */ - private static final Log __log = LogFactory.getLog(NSContext.class); + private static final Logger __log = LoggerFactory.getLogger(NSContext.class); /** Prefix-to-URI map. */ private HashMap<String, String> _prefixToUriMap = new HashMap<String, String>() { http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/Properties.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/Properties.java b/utils/src/main/java/org/apache/ode/utils/Properties.java index 63c91e8..d006b1c 100644 --- a/utils/src/main/java/org/apache/ode/utils/Properties.java +++ b/utils/src/main/java/org/apache/ode/utils/Properties.java @@ -35,8 +35,8 @@ import org.apache.commons.httpclient.params.HttpClientParams; import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.httpclient.params.HttpParams; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -94,7 +94,7 @@ public class Properties { public static final String PROP_SEND_WS_ADDRESSING_HEADERS = "ws-addressing.headers"; - protected static final Log log = LogFactory.getLog(Properties.class); + protected static final Logger log = LoggerFactory.getLogger(Properties.class); public static Object[] getProxyAndHeaders(Map<String, String> properties) { ArrayList<Header> headers = null; // /!\ Axis2 requires an ArrayList (not a List implementation) http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/SerializableElement.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/SerializableElement.java b/utils/src/main/java/org/apache/ode/utils/SerializableElement.java index 4e868fb..6e66044 100644 --- a/utils/src/main/java/org/apache/ode/utils/SerializableElement.java +++ b/utils/src/main/java/org/apache/ode/utils/SerializableElement.java @@ -18,8 +18,8 @@ */ package org.apache.ode.utils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Element; @@ -35,7 +35,7 @@ import java.io.Serializable; */ public final class SerializableElement implements Serializable { private static final long serialVersionUID = -1L; - private static final Log __log = LogFactory.getLog(SerializableElement.class); + private static final Logger __log = LoggerFactory.getLogger(SerializableElement.class); private transient Element e; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/URITemplate.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/URITemplate.java b/utils/src/main/java/org/apache/ode/utils/URITemplate.java index 370aa0f..990ba90 100644 --- a/utils/src/main/java/org/apache/ode/utils/URITemplate.java +++ b/utils/src/main/java/org/apache/ode/utils/URITemplate.java @@ -21,8 +21,8 @@ package org.apache.ode.utils; import org.apache.commons.httpclient.URIException; import org.apache.commons.httpclient.util.URIUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Map; @@ -78,7 +78,7 @@ import java.util.regex.Pattern; public class URITemplate { - private static final Log log = LogFactory.getLog(URITemplate.class); + private static final Logger log = LoggerFactory.getLogger(URITemplate.class); public static final String EXPANSION_REGEX = "\\{[^\\}]+\\}"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/WatchDog.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/WatchDog.java b/utils/src/main/java/org/apache/ode/utils/WatchDog.java index 9f690af..ba16a27 100644 --- a/utils/src/main/java/org/apache/ode/utils/WatchDog.java +++ b/utils/src/main/java/org/apache/ode/utils/WatchDog.java @@ -19,8 +19,8 @@ package org.apache.ode.utils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.util.Map; @@ -47,7 +47,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; */ public class WatchDog<T, C extends WatchDog.Observer> implements Runnable { static final public long DEFAULT_DELAY = 30000; - final Log log = LogFactory.getLog(WatchDog.class); + final Logger log = LoggerFactory.getLogger(WatchDog.class); private long expire; private T lastModif; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/cli/BaseCommandlineTool.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/cli/BaseCommandlineTool.java b/utils/src/main/java/org/apache/ode/utils/cli/BaseCommandlineTool.java index 198ddf2..1ca8385 100644 --- a/utils/src/main/java/org/apache/ode/utils/cli/BaseCommandlineTool.java +++ b/utils/src/main/java/org/apache/ode/utils/cli/BaseCommandlineTool.java @@ -19,20 +19,23 @@ package org.apache.ode.utils.cli; -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.FileAppender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; -import org.apache.log4j.SimpleLayout; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.appender.ConsoleAppender; +import org.apache.logging.log4j.core.appender.FileAppender; +import org.apache.logging.log4j.core.config.AppenderRef; +import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.LoggerConfig; +import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.ode.utils.Version; import org.apache.ode.utils.fs.TempFileManager; import org.apache.ode.utils.msg.MessageBundle; import java.io.IOException; -import java.io.PrintWriter; +import java.nio.charset.Charset; public abstract class BaseCommandlineTool { @@ -91,13 +94,16 @@ public abstract class BaseCommandlineTool { * @param level */ protected static void initLogging(int level) { - ConsoleAppender appender = new ConsoleAppender(new SimpleLayout()); - appender.setName("stderr appender"); - appender.setWriter(new PrintWriter(System.err)); - appender.setLayout(new PatternLayout(LOGGING_PATTERN)); - initialize(appender, level); - BasicConfigurator.configure(appender); - Logger.getRootLogger().addAppender(appender); + final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); + final Configuration config = ctx.getConfiguration(); + LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME); + Layout layout = PatternLayout.createLayout(LOGGING_PATTERN,config,null,Charset.forName("UTF-8"),true,false,null,null); + Appender appender = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "stderr appender", "false", "true"); + AppenderRef ref = initialize("stderr appender", level); + AppenderRef[] refs = new AppenderRef[] {ref}; + loggerConfig.addAppender(appender, ref.getLevel(), null); + loggerConfig.setLevel(ref.getLevel()); + ctx.updateLoggers(); } protected static void initLogFile() throws IOException { @@ -105,25 +111,33 @@ public abstract class BaseCommandlineTool { } protected static void initLogFile(int level) throws IOException { - FileAppender appender = new FileAppender(new PatternLayout(LOGGING_PATTERN), - System.getProperty("ode.home") + "/logs/ode.log"); - appender.setName("file appender"); - initialize(appender, level); - BasicConfigurator.configure(appender); - Logger.getRootLogger().addAppender(appender); + final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); + final Configuration config = ctx.getConfiguration(); + LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME); + Layout layout = PatternLayout.createLayout(LOGGING_PATTERN,config,null,Charset.forName("UTF-8"),true,false,null,null); + Appender appender = FileAppender.createAppender(System.getProperty("ode.home") + "/logs/ode.log", "false", "false", "File", "false", + "true", "true", "8192", layout, null, "false", null, config); + AppenderRef ref = initialize("File", level); + AppenderRef[] refs = new AppenderRef[] {ref}; + loggerConfig.addAppender(appender, ref.getLevel(), null); + loggerConfig.setLevel(ref.getLevel()); + ctx.updateLoggers(); } - private static void initialize(AppenderSkeleton appender, int level) { - switch (level) { - case EFFUSIVE : - appender.setThreshold(Level.DEBUG); - break; - case VERBOSE : - appender.setThreshold(Level.INFO); - break; - default : - appender.setThreshold(Level.WARN); + private static AppenderRef initialize(String name, int level) { + Level appenderLevel = null; + switch (level) { + case EFFUSIVE : + appenderLevel = Level.DEBUG; + break; + case VERBOSE : + appenderLevel = Level.INFO; + break; + default : + appenderLevel = Level.WARN; + break; } + return AppenderRef.createAppenderRef(name, appenderLevel, null); } protected static void setClazz(Class c) { http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java b/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java index 8f90e30..0b0d453 100644 --- a/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java +++ b/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java @@ -24,15 +24,15 @@ import java.util.ArrayList; import java.util.List; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Various file system utilities. */ public class FileUtils { - private static final Log __log = LogFactory.getLog(FileUtils.class); + private static final Logger __log = LoggerFactory.getLogger(FileUtils.class); /** * Test if the given path is absolute or not. http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/fs/TempFileManager.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/fs/TempFileManager.java b/utils/src/main/java/org/apache/ode/utils/fs/TempFileManager.java index c967370..447371c 100644 --- a/utils/src/main/java/org/apache/ode/utils/fs/TempFileManager.java +++ b/utils/src/main/java/org/apache/ode/utils/fs/TempFileManager.java @@ -27,15 +27,15 @@ import java.util.Collections; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Convenience class for managing temporary files and cleanup on JVM exit. */ public class TempFileManager { - private static final Log __log = LogFactory.getLog(TempFileManager.class); + private static final Logger __log = LoggerFactory.getLogger(TempFileManager.class); private static TempFileManager __singleton; private static File __baseDir; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/jmx/SimpleMBean.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/jmx/SimpleMBean.java b/utils/src/main/java/org/apache/ode/utils/jmx/SimpleMBean.java index 91bd639..b38b276 100644 --- a/utils/src/main/java/org/apache/ode/utils/jmx/SimpleMBean.java +++ b/utils/src/main/java/org/apache/ode/utils/jmx/SimpleMBean.java @@ -24,15 +24,15 @@ import java.util.concurrent.atomic.AtomicLong; import javax.management.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An extension of {@link StandardMBean} with common features such as registeration, * notification, sequence generation, etc. "built-in." */ public abstract class SimpleMBean extends StandardMBean implements MBeanRegistration, NotificationEmitter { - private static final Log __log = LogFactory.getLog(SimpleMBean.class); + private static final Logger __log = LoggerFactory.getLogger(SimpleMBean.class); protected MBeanServer _mbeanServer; protected ObjectName _myName; @@ -91,7 +91,7 @@ public abstract class SimpleMBean extends StandardMBean implements MBeanRegistra } catch (InstanceNotFoundException ex) { // ignore } catch (MBeanRegistrationException ex) { - __log.fatal("Error unregistering mbean: " + getObjectName().getCanonicalName(), ex); + __log.error("Error unregistering mbean: " + getObjectName().getCanonicalName(), ex); } try { server.registerMBean(this, getObjectName()); @@ -136,7 +136,7 @@ public abstract class SimpleMBean extends StandardMBean implements MBeanRegistra return new ObjectName(buf.toString()); } catch (Exception ex) { String errmsg = "DomainNodeImpl.createObjectName is broken!"; - __log.fatal(errmsg,ex); + __log.error(errmsg,ex); throw new AssertionError(errmsg); } } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/rmi/RMIConstants.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/rmi/RMIConstants.java b/utils/src/main/java/org/apache/ode/utils/rmi/RMIConstants.java index a462740..a6da788 100644 --- a/utils/src/main/java/org/apache/ode/utils/rmi/RMIConstants.java +++ b/utils/src/main/java/org/apache/ode/utils/rmi/RMIConstants.java @@ -19,15 +19,15 @@ package org.apache.ode.utils.rmi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Constant related to naming of ODE objects in JMX. * @deprecated DO NO USE: Find your own way to get this URL. */ public final class RMIConstants { - private static final Log __log = LogFactory.getLog(RMIConstants.class); + private static final Logger __log = LoggerFactory.getLogger(RMIConstants.class); /** http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/sax/LoggingErrorHandler.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/sax/LoggingErrorHandler.java b/utils/src/main/java/org/apache/ode/utils/sax/LoggingErrorHandler.java index 6e1f8c9..69bf8a1 100644 --- a/utils/src/main/java/org/apache/ode/utils/sax/LoggingErrorHandler.java +++ b/utils/src/main/java/org/apache/ode/utils/sax/LoggingErrorHandler.java @@ -22,8 +22,8 @@ package org.apache.ode.utils.sax; import org.apache.ode.utils.msg.CommonMessages; import org.apache.ode.utils.msg.MessageBundle; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -34,8 +34,8 @@ import org.xml.sax.SAXParseException; */ public class LoggingErrorHandler implements ErrorHandler { - private static final Log __log = LogFactory.getLog(LoggingErrorHandler.class); - private Log _l; + private static final Logger __log = LoggerFactory.getLogger(LoggingErrorHandler.class); + private Logger _l; private static final String WARNING = MessageBundle.getMessages(CommonMessages.class) .strWarning().toUpperCase(); @@ -59,7 +59,7 @@ public class LoggingErrorHandler implements ErrorHandler { * @param log * the <code>Log</code> on which to dump messages. */ - public LoggingErrorHandler(Log log) { + public LoggingErrorHandler(Logger log) { _l = log; } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/trax/LogErrorListener.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/trax/LogErrorListener.java b/utils/src/main/java/org/apache/ode/utils/trax/LogErrorListener.java index dcb9206..b569adb 100644 --- a/utils/src/main/java/org/apache/ode/utils/trax/LogErrorListener.java +++ b/utils/src/main/java/org/apache/ode/utils/trax/LogErrorListener.java @@ -21,13 +21,13 @@ package org.apache.ode.utils.trax; import javax.xml.transform.ErrorListener; import javax.xml.transform.TransformerException; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; public class LogErrorListener implements ErrorListener { - private Log _log; + private Logger _log; - public LogErrorListener(Log log) { + public LogErrorListener(Logger log) { _log = log; } @@ -37,12 +37,12 @@ public class LogErrorListener implements ErrorListener { } public void error(TransformerException exception) throws TransformerException { - _log.error(exception.getMessageAndLocation(),exception); + _log.error("",exception.getMessageAndLocation(),exception); } public void fatalError(TransformerException exception) throws TransformerException { - _log.fatal(exception.getMessageAndLocation(),exception); + _log.error("",exception.getMessageAndLocation(),exception); } } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xml/capture/Tracker.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xml/capture/Tracker.java b/utils/src/main/java/org/apache/ode/utils/xml/capture/Tracker.java index f51cfd3..942c96f 100644 --- a/utils/src/main/java/org/apache/ode/utils/xml/capture/Tracker.java +++ b/utils/src/main/java/org/apache/ode/utils/xml/capture/Tracker.java @@ -21,8 +21,8 @@ package org.apache.ode.utils.xml.capture; import java.net.URI; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; @@ -32,7 +32,7 @@ import org.xml.sax.SAXException; * Base class for schema-specifc dependency trackers. */ public abstract class Tracker implements ContentHandler { - private static final Log __log = LogFactory.getLog(Tracker.class); + private static final Logger __log = LoggerFactory.getLogger(Tracker.class); private Set<URI> references_ ; private URI base_; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xml/capture/Wsdl11Tracker.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xml/capture/Wsdl11Tracker.java b/utils/src/main/java/org/apache/ode/utils/xml/capture/Wsdl11Tracker.java index 086b9e3..01ebb3d 100644 --- a/utils/src/main/java/org/apache/ode/utils/xml/capture/Wsdl11Tracker.java +++ b/utils/src/main/java/org/apache/ode/utils/xml/capture/Wsdl11Tracker.java @@ -18,8 +18,8 @@ */ package org.apache.ode.utils.xml.capture; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -29,7 +29,7 @@ import org.xml.sax.SAXException; * document may have in-line schemas. */ public class Wsdl11Tracker extends XmlSchemaTracker { - private static final Log __log = LogFactory.getLog(Wsdl11Tracker.class); + private static final Logger __log = LoggerFactory.getLogger(Wsdl11Tracker.class); public static final String NS = "http://schemas.xmlsoap.org/wsdl/";; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xml/capture/XmlSchemaTracker.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xml/capture/XmlSchemaTracker.java b/utils/src/main/java/org/apache/ode/utils/xml/capture/XmlSchemaTracker.java index f9a7555..80ba0b1 100644 --- a/utils/src/main/java/org/apache/ode/utils/xml/capture/XmlSchemaTracker.java +++ b/utils/src/main/java/org/apache/ode/utils/xml/capture/XmlSchemaTracker.java @@ -18,8 +18,8 @@ */ package org.apache.ode.utils.xml.capture; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -27,7 +27,7 @@ import org.xml.sax.SAXException; * {@link Tracker} for XML schema imports / includes. */ public class XmlSchemaTracker extends Tracker { - private static final Log __log = LogFactory.getLog(XmlSchemaTracker.class); + private static final Logger __log = LoggerFactory.getLogger(XmlSchemaTracker.class); private static final String NS="http://www.w3.org/2001/XMLSchema"; ; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java b/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java index cdfb96f..a435e48 100644 --- a/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java +++ b/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java @@ -18,8 +18,8 @@ */ package org.apache.ode.utils.xsd; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.utils.StreamUtils; import org.apache.ode.utils.fs.FileUtils; import org.apache.xerces.xni.XMLResourceIdentifier; @@ -40,8 +40,7 @@ import java.util.Map; * "whole" of a schema document (including imports and other dependencies). */ public class CapturingXMLEntityResolver implements XMLEntityResolver { - private static final Log __log = LogFactory - .getLog(CapturingXMLEntityResolver.class); + private static final Logger __log = LoggerFactory.getLogger(CapturingXMLEntityResolver.class); private XMLEntityResolver _resolver; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java b/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java index 0a6cd36..8e11718 100644 --- a/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java +++ b/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java @@ -19,7 +19,7 @@ package org.apache.ode.utils.xsd; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; import org.apache.ode.utils.msg.MessageBundle; import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.parser.XMLErrorHandler; @@ -31,20 +31,20 @@ import org.apache.xerces.xni.parser.XMLParseException; */ public class LoggingXmlErrorHandler implements XMLErrorHandler { - private Log _log; + private Logger _log; private static final XsdMessages __msgs = MessageBundle.getMessages(XsdMessages.class); private XMLParseException _ex; /** - * Create a new instance that will output to the specified {@link Log} + * Create a new instance that will output to the specified {@link Logger} * instance. * * @param log * the target log, which much be non-<code>null</code> */ - public LoggingXmlErrorHandler(Log log) { + public LoggingXmlErrorHandler(Logger log) { assert log != null; _log = log; } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java b/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java index 39d5e69..b8ebb39 100644 --- a/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java +++ b/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java @@ -27,8 +27,8 @@ import java.util.Map; import javax.xml.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.xerces.dom.DOMInputImpl; import org.apache.xerces.impl.Constants; import org.apache.xerces.impl.xs.XMLSchemaLoader; @@ -48,7 +48,7 @@ import org.w3c.dom.ls.LSInput; * Xerces based schema model. */ public class SchemaModelImpl implements SchemaModel { - private static final Log __log = LogFactory.getLog(SchemaModelImpl.class); + private static final Logger __log = LoggerFactory.getLogger(SchemaModelImpl.class); private XSModel _model; private SchemaModelImpl(XSModel model) { @@ -99,8 +99,8 @@ public class SchemaModelImpl implements SchemaModel { boolean isWarning = (error.getSeverity() == DOMError.SEVERITY_WARNING); __log.warn("Schema error", ((Exception)error.getRelatedException())); __log.warn(error.getLocation().getUri() + ":" + error.getLocation().getLineNumber()); - __log.warn(error.getRelatedData()); - __log.warn(error.getRelatedException()); + __log.warn("",error.getRelatedData()); + __log.warn("",error.getRelatedException()); return isWarning; } } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java b/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java index 0c2cc26..7659c13 100644 --- a/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java +++ b/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.utils.msg.MessageBundle; import org.apache.xerces.dom.DOMInputImpl; import org.apache.xerces.impl.Constants; @@ -46,7 +46,7 @@ import org.w3c.dom.ls.LSInput; */ public class XSUtils { - private static final Log __log = LogFactory.getLog(XSUtils.class); + private static final Logger __log = LoggerFactory.getLogger(XSUtils.class); private static final XsdMessages __msgs = MessageBundle.getMessages(XsdMessages.class); @@ -145,16 +145,16 @@ public class XSUtils { */ static class LoggingXmlErrorHandler implements XMLErrorHandler { - private Log _log; + private Logger _log; private ArrayList<XMLParseException> _errors = new ArrayList<XMLParseException>(); /** - * Create a new instance that will output to the specified {@link Log} + * Create a new instance that will output to the specified {@link Logger} * instance. * @param log the target log, which much be non-<code>null</code> */ - public LoggingXmlErrorHandler(Log log) { + public LoggingXmlErrorHandler(Logger log) { assert log != null; _log = log; } @@ -209,9 +209,9 @@ public class XSUtils { static class LoggingDOMErrorHandler implements DOMErrorHandler { private ArrayList<Exception> _exceptions = new ArrayList<Exception>(); - private Log _log; + private Logger _log; - public LoggingDOMErrorHandler(Log log) { + public LoggingDOMErrorHandler(Logger log) { assert log != null; _log = log; } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xsd/XsdMessages.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xsd/XsdMessages.java b/utils/src/main/java/org/apache/ode/utils/xsd/XsdMessages.java index ccac792..2e28e08 100644 --- a/utils/src/main/java/org/apache/ode/utils/xsd/XsdMessages.java +++ b/utils/src/main/java/org/apache/ode/utils/xsd/XsdMessages.java @@ -38,7 +38,7 @@ public class XsdMessages extends MessageBundle { } /** - * A key to indicate that a message is fatal error. + * A key to indicate that a message is error error. */ public String msgXsdFatal() { return this.format("FATAL"); @@ -48,7 +48,7 @@ public class XsdMessages extends MessageBundle { * Format a log message about an XSD-related warning or error. * * @param type - * the type of occurrence (e.g., warning, error, fatal) + * the type of occurrence (e.g., warning, error, error) * @param msg * the warning message * @param systemId http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java b/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java index 6d29852..686a7d3 100644 --- a/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java +++ b/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java @@ -38,8 +38,8 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.apache.commons.collections.map.MultiKeyMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.utils.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -55,7 +55,7 @@ import org.w3c.dom.Node; */ public class XslTransformHandler { - private static final Log __log = LogFactory.getLog(XslTransformHandler.class); + private static final Logger __log = LoggerFactory.getLogger(XslTransformHandler.class); private static XslTransformHandler __singleton; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/test/java/org/apache/ode/utils/xsd/SchemaCaptureTest.java ---------------------------------------------------------------------- diff --git a/utils/src/test/java/org/apache/ode/utils/xsd/SchemaCaptureTest.java b/utils/src/test/java/org/apache/ode/utils/xsd/SchemaCaptureTest.java index 2a2acd9..87a0490 100644 --- a/utils/src/test/java/org/apache/ode/utils/xsd/SchemaCaptureTest.java +++ b/utils/src/test/java/org/apache/ode/utils/xsd/SchemaCaptureTest.java @@ -26,8 +26,8 @@ import java.io.InputStream; import java.net.URI; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.utils.StreamUtils; import org.apache.ode.utils.TestResources; import org.apache.xerces.xni.XMLResourceIdentifier; @@ -40,7 +40,7 @@ import org.junit.Test; * Test schema capture functionality. */ public class SchemaCaptureTest { - private static Log __log = LogFactory.getLog(SchemaCaptureTest.class); + private static Logger __log = LoggerFactory.getLogger(SchemaCaptureTest.class); @Test public void testSchemaCapture() throws Exception { http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/utils/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/utils/src/test/resources/log4j2.xml b/utils/src/test/resources/log4j2.xml new file mode 100644 index 0000000..21313ee --- /dev/null +++ b/utils/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ +<Configuration> + <Appenders> + <File name="FILE" fileName="target/test/test.log" append="false"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </File> + <Console name="STDOUT" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </Console> + <Async name="Async"> + <AppenderRef ref="FILE"/> + <AppenderRef ref="STDOUT"/> + </Async> + </Appenders> + + <Loggers> + <Logger name="org.apache.ode" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.axis2" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.hibernate" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.openjpa" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.springframework" level="error" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + + <Root level="info"> + <AppenderRef ref="Async"/> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file
