http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java index 2c39f1b..c8388af 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java +++ b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java @@ -27,8 +27,8 @@ import java.util.concurrent.ConcurrentHashMap; import javax.sql.DataSource; 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.daohib.HibernateTransactionManagerLookup; import org.apache.ode.daohib.SessionManager; import org.apache.ode.store.ConfStoreConnectionFactory; @@ -43,7 +43,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.connection.ConnectionProvider; public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory { - private static final Log __log = LogFactory.getLog(DbConfStoreConnectionFactory.class); + private static final Logger __log = LoggerFactory.getLogger(DbConfStoreConnectionFactory.class); private static final Messages __msgs = MessageBundle.getMessages(Messages.class); @@ -108,7 +108,7 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory Object txFact = txFactClass.newInstance(); _txMgr = (TransactionManager) txFactClass.getMethod("getTransactionManager", (Class[]) null).invoke(txFact); } catch (Exception e) { - __log.fatal("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e); + __log.error("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e); throw new RuntimeException("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e); } } @@ -168,4 +168,4 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory } } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java b/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java index b7fcfd0..4feb872 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java +++ b/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java @@ -19,8 +19,8 @@ package org.apache.ode.store.jpa; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.store.ConfStoreConnection; import org.apache.ode.store.DeploymentUnitDAO; @@ -35,7 +35,7 @@ import java.util.List; * @author Matthieu Riou <mriou at apache dot org> */ public class ConfStoreConnectionJpa implements ConfStoreConnection { - private static Log LOG = LogFactory.getLog(ConfStoreConnectionJpa.class); + private static Logger LOG = LoggerFactory.getLogger(ConfStoreConnectionJpa.class); private EntityManager _em; static final ThreadLocal<EntityManager> _current = new ThreadLocal<EntityManager>(); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java b/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java index 8239608..3578af1 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java +++ b/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java @@ -19,8 +19,8 @@ package org.apache.ode.store.jpa; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.dao.jpa.JpaTxMgrProvider; import org.apache.ode.store.ConfStoreConnection; import org.apache.ode.store.ConfStoreConnectionFactory; @@ -38,7 +38,7 @@ import java.util.Properties; * @author Matthieu Riou <mriou at apache dot org> */ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory { - private static final Log __log = LogFactory.getLog(DbConfStoreConnectionFactory.class); + private static final Logger __log = LoggerFactory.getLogger(DbConfStoreConnectionFactory.class); private DataSource _ds; private EntityManagerFactory _emf; @@ -117,8 +117,8 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory Object txFact = txFactClass.newInstance(); _txMgr = (TransactionManager) txFactClass.getMethod("getTransactionManager", (Class[]) null).invoke(txFact); } catch (Exception e) { - __log.fatal("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e); + __log.error("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e); throw new RuntimeException("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-store/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/bpel-store/src/test/resources/log4j2.xml b/bpel-store/src/test/resources/log4j2.xml new file mode 100644 index 0000000..21313ee --- /dev/null +++ b/bpel-store/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/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java ---------------------------------------------------------------------- diff --git a/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java b/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java index be0a922..4ddcfa1 100644 --- a/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java +++ b/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java @@ -44,8 +44,8 @@ import javax.sql.DataSource; import javax.transaction.TransactionManager; 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.bpel.common.evt.DebugBpelEventListener; import org.apache.ode.bpel.dao.BpelDAOConnectionFactory; import org.apache.ode.bpel.engine.BpelServerImpl; @@ -73,7 +73,7 @@ import org.junit.Before; import org.w3c.dom.Element; public abstract class BPELTestAbstract { - private static final Log log = LogFactory.getLog(BPELTestAbstract.class); + private static final Logger log = LoggerFactory.getLogger(BPELTestAbstract.class); public static final long WAIT_BEFORE_INVOKE_TIMEOUT = 2000; private static final String SHOW_EVENTS_ON_CONSOLE = "no"; @@ -712,4 +712,4 @@ public abstract class BPELTestAbstract { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-test/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/bpel-test/src/test/resources/log4j2.xml b/bpel-test/src/test/resources/log4j2.xml new file mode 100644 index 0000000..21313ee --- /dev/null +++ b/bpel-test/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/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java index 1a0cd70..2d9661a 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java @@ -33,11 +33,11 @@ import org.hibernate.id.SequenceHiLoGenerator; import org.hibernate.id.TableHiLoGenerator; import org.hibernate.type.Type; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NativeHiLoGenerator implements IdentifierGenerator, PersistentIdentifierGenerator, Configurable { - private static final Log __log = LogFactory.getLog(NativeHiLoGenerator.class); + private static final Logger __log = LoggerFactory.getLogger(NativeHiLoGenerator.class); private IdentifierGenerator _proxy; public NativeHiLoGenerator() { http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java index 83131a9..a09b617 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java @@ -18,8 +18,8 @@ */ package org.apache.ode.daohib; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.daohib.bpel.hobj.*; import org.apache.ode.utils.uuid.UUID; import org.hibernate.HibernateException; @@ -44,7 +44,7 @@ import java.util.Properties; * managing sessions. */ public class SessionManager { - private static final Log __log = LogFactory.getLog(SessionManager.class); + private static final Logger __log = LoggerFactory.getLogger(SessionManager.class); public static final String PROP_GUID = "ode.hibernate.guid"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java index 83e8912..a5deae1 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java @@ -24,8 +24,8 @@ import java.util.Properties; import javax.sql.DataSource; 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.dao.BpelDAOConnection; import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC; import org.apache.ode.daohib.DataSourceConnectionProvider; @@ -40,7 +40,7 @@ import org.hibernate.cfg.Environment; * implementation. */ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDBC { - private static final Log __log = LogFactory.getLog(BpelDAOConnectionFactoryImpl.class); + private static final Logger __log = LoggerFactory.getLogger(BpelDAOConnectionFactoryImpl.class); protected SessionManager _sessionManager; @@ -69,13 +69,13 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB public void init(Properties initialProps) { if (_ds == null) { String errmsg = "setDataSource() not called!"; - __log.fatal(errmsg); + __log.error(errmsg); throw new IllegalStateException(errmsg); } if (_tm == null) { String errmsg = "setTransactionManager() not called!"; - __log.fatal(errmsg); + __log.error(errmsg); throw new IllegalStateException(errmsg); } @@ -139,4 +139,4 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB // Hibernate doesn't use this. } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java index 7a19ffd..c5de751 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java @@ -34,8 +34,8 @@ import java.util.Set; 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.bpel.common.BpelEventFilter; import org.apache.ode.bpel.common.InstanceFilter; import org.apache.ode.bpel.common.ProcessState; @@ -77,7 +77,7 @@ import org.hibernate.criterion.Projections; * Hibernate-based {@link BpelDAOConnection} implementation. */ public class BpelDAOConnectionImpl implements BpelDAOConnection, FilteredInstanceDeletable { - private static final Log __log = LogFactory.getLog(BpelDAOConnectionImpl.class); + private static final Logger __log = LoggerFactory.getLogger(BpelDAOConnectionImpl.class); protected SessionManager _sm; @@ -238,7 +238,7 @@ public class BpelDAOConnectionImpl implements BpelDAOConnection, FilteredInstanc hevent.setData(bos.toByteArray()); } catch (Throwable ex) { // this is really unexpected. - __log.fatal("InternalError: BpelEvent serialization failed.", ex); + __log.error("InternalError: BpelEvent serialization failed.", ex); } sess.save(hevent); } @@ -275,7 +275,7 @@ public class BpelDAOConnectionImpl implements BpelDAOConnection, FilteredInstanc }); } catch (Exception ex) { - __log.fatal("Internal error: unable to transform HBpelEvent", ex); + __log.error("Internal error: unable to transform HBpelEvent", ex); throw new RuntimeException(ex); } return ret; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java index 0a8aff3..42fc3e6 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java @@ -20,8 +20,8 @@ package org.apache.ode.daohib.bpel; import java.util.*; -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.common.CorrelationKey; import org.apache.ode.bpel.common.CorrelationKeySet; import org.apache.ode.bpel.dao.*; @@ -43,7 +43,7 @@ import javax.xml.namespace.QName; * Hibernate-based {@link CorrelatorDAO} implementation. */ class CorrelatorDaoImpl extends HibernateDao implements CorrelatorDAO { - static Log __log = LogFactory.getLog(CorrelatorDaoImpl.class); + static Logger __log = LoggerFactory.getLogger(CorrelatorDaoImpl.class); /** filter for finding a matching selector. */ private static final String LOCK_SELECTORS = "update from HCorrelatorSelector as hs set hs.lock = hs.lock+1 where hs.processType = :processType"; @@ -272,4 +272,4 @@ class CorrelatorDaoImpl extends HibernateDao implements CorrelatorDAO { return routes; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java index 7a2bf5c..7347012 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java @@ -27,8 +27,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.bpel.common.BpelEventFilter; import org.apache.ode.bpel.common.Filter; import org.apache.ode.bpel.common.InstanceFilter; @@ -46,7 +46,7 @@ import org.hibernate.criterion.Restrictions; * {@link org.hibernate.Criteria} objects. */ class CriteriaBuilder { - static final Log __log = LogFactory.getLog(CriteriaBuilder.class); + static final Logger __log = LoggerFactory.getLogger(CriteriaBuilder.class); /** * Build a HQL query from an instance filter. @@ -240,7 +240,7 @@ class CriteriaBuilder { try { dt = ISO8601DateParser.parse(date); } catch (ParseException e) { - __log.error(e); + __log.error("",e); } Timestamp ts = new Timestamp(dt.getTime()); return op + " '" + ts.toString() + "'"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java index 07420bd..6d900ad 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java @@ -20,8 +20,8 @@ package org.apache.ode.daohib.bpel; import org.apache.ode.daohib.SessionManager; import org.apache.ode.daohib.bpel.hobj.HObject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.hibernate.Query; import org.hibernate.Session; @@ -39,7 +39,7 @@ public abstract class HibernateDao { // logger used by subclasses to track entered methods that may trigger sql query // we don't use the package name to avoid interferences with other logging info. - static final Log logDao = LogFactory.getLog("org.apache.ode.bpel.DAO"); + static final Logger logDao = LoggerFactory.getLogger("org.apache.ode.bpel.DAO"); protected final SessionManager _sm; protected final HObject _hobj; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java index ba39425..5b711ce 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java @@ -27,8 +27,8 @@ import java.util.Set; 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.bpel.dao.MessageDAO; import org.apache.ode.bpel.dao.MessageExchangeDAO; import org.apache.ode.bpel.dao.PartnerLinkDAO; @@ -48,7 +48,7 @@ import org.w3c.dom.Element; public class MessageExchangeDaoImpl extends HibernateDao implements MessageExchangeDAO { @SuppressWarnings("unused") - private static final Log __log = LogFactory.getLog(MessageExchangeDaoImpl.class); + private static final Logger __log = LoggerFactory.getLogger(MessageExchangeDaoImpl.class); private HMessageExchange _hself; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java index 974c5eb..85d4835 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java @@ -27,8 +27,8 @@ import java.util.Set; 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.bpel.common.CorrelationKey; import org.apache.ode.bpel.common.ProcessState; import org.apache.ode.bpel.dao.CorrelatorDAO; @@ -66,7 +66,7 @@ import org.hibernate.criterion.Order; * Hibernate-based {@link ProcessDAO} implementation. */ public class ProcessDaoImpl extends HibernateDao implements ProcessDAO, DeferredProcessInstanceCleanable { - private static final Log __log = LogFactory.getLog(ProcessDaoImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ProcessDaoImpl.class); private static final String QRY_CORRELATOR = "where this.correlatorId = ?"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java index 23022ad..11504b3 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java @@ -28,8 +28,8 @@ import java.util.Set; 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.bpel.common.ProcessState; import org.apache.ode.bpel.dao.ActivityRecoveryDAO; import org.apache.ode.bpel.dao.BpelDAOConnection; @@ -75,7 +75,7 @@ import org.w3c.dom.Element; * Hibernate-based {@link ProcessInstanceDAO} implementation. */ public class ProcessInstanceDaoImpl extends HibernateDao implements ProcessInstanceDAO { - private static final Log __log = LogFactory.getLog(ProcessInstanceDaoImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ProcessInstanceDaoImpl.class); /** Query for removing selectors. */ private static final String QRY_DELSELECTORS = "delete from " + http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/GZipDataType.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/GZipDataType.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/GZipDataType.java index f06a1e3..c272eaa 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/GZipDataType.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/GZipDataType.java @@ -32,8 +32,8 @@ import java.sql.Types; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.hibernate.usertype.UserType; @@ -42,7 +42,7 @@ import org.hibernate.usertype.UserType; * to increase performance and save disk space. */ public class GZipDataType implements UserType { - private static final Log log = LogFactory.getLog(GZipDataType.class); + private static final Logger log = LoggerFactory.getLogger(GZipDataType.class); public static final int[] SQL_TYPES = new int[] { Types.BLOB }; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-hibernate/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/test/resources/log4j2.xml b/dao-hibernate/src/test/resources/log4j2.xml new file mode 100644 index 0000000..21313ee --- /dev/null +++ b/dao-hibernate/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/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java index 82fceb4..45d5d28 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java @@ -18,8 +18,8 @@ */ package org.apache.ode.dao.jpa; -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.dao.BpelDAOConnection; import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC; import org.apache.openjpa.ee.ManagedRuntime; @@ -44,7 +44,7 @@ import java.util.Properties; * @author Matthieu Riou <mriou at apache dot org> */ public class BPELDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDBC { - static final Log __log = LogFactory.getLog(BPELDAOConnectionFactoryImpl.class); + static final Logger __log = LoggerFactory.getLogger(BPELDAOConnectionFactoryImpl.class); protected EntityManagerFactory _emf; private TransactionManager _tm; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java index 4bccfa1..f161d6e 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java @@ -34,8 +34,8 @@ import javax.persistence.EntityManager; import javax.persistence.Query; 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.bpel.common.BpelEventFilter; import org.apache.ode.bpel.common.Filter; import org.apache.ode.bpel.common.InstanceFilter; @@ -57,7 +57,7 @@ import org.apache.openjpa.persistence.OpenJPAQuery; * @author Matthieu Riou <mriou at apache dot org> */ public class BPELDAOConnectionImpl implements BpelDAOConnection { - static final Log __log = LogFactory.getLog(BPELDAOConnectionImpl.class); + static final Logger __log = LoggerFactory.getLogger(BPELDAOConnectionImpl.class); protected EntityManager _em; @@ -148,7 +148,7 @@ public class BPELDAOConnectionImpl implements BpelDAOConnection { try { dt = ISO8601DateParser.parse(date); } catch (ParseException e) { - __log.error(e); + __log.error("",e); } Timestamp ts = new Timestamp(dt.getTime()); return op + " '" + ts.toString() + "'"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java index 78c0ab3..84681b7 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java @@ -19,8 +19,8 @@ package org.apache.ode.dao.jpa; -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.common.CorrelationKeySet; import org.apache.ode.bpel.dao.*; @@ -34,7 +34,7 @@ import java.util.List; @Table(name = "ODE_CORRELATOR") @NamedQueries( { @NamedQuery(name = CorrelatorDAOImpl.DELETE_CORRELATORS_BY_PROCESS, query = "delete from CorrelatorDAOImpl as c where c._process = :process") }) public class CorrelatorDAOImpl extends OpenJPADAO implements CorrelatorDAO { - private static Log __log = LogFactory.getLog(CorrelatorDAOImpl.class); + private static Logger __log = LoggerFactory.getLogger(CorrelatorDAOImpl.class); public final static String DELETE_CORRELATORS_BY_PROCESS = "DELETE_CORRELATORS_BY_PROCESS"; private final static String ROUTE_BY_CKEY_HEADER = "select route from MessageRouteDAOImpl as route where route._correlator._process._processType = :ptype and route._correlator._correlatorKey = :corrkey"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java index 6da0299..abf308d 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java @@ -19,8 +19,8 @@ package org.apache.ode.dao.jpa; -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.dao.MessageDAO; import org.apache.ode.bpel.dao.MessageExchangeDAO; import org.apache.ode.utils.DOMUtils; @@ -46,7 +46,7 @@ import javax.xml.namespace.QName; @Table(name = "ODE_MESSAGE") @NamedQueries( { @NamedQuery(name = MessageDAOImpl.DELETE_MESSAGES_BY_PROCESS, query = "delete from MessageDAOImpl as m where m._messageExchange._process = :process") }) public class MessageDAOImpl implements MessageDAO { - private static Log __log = LogFactory.getLog(MessageDAOImpl.class); + private static Logger __log = LoggerFactory.getLogger(MessageDAOImpl.class); public final static String DELETE_MESSAGES_BY_PROCESS = "DELETE_MESSAGES_BY_PROCESS"; @Id http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java index 7deeee8..d9e5617 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java @@ -19,8 +19,8 @@ package org.apache.ode.dao.jpa; -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.common.CorrelationKeySet; import org.apache.ode.bpel.common.CorrelationKey; import org.apache.ode.bpel.dao.*; @@ -56,7 +56,7 @@ import java.util.Set; @NamedQuery(name=MessageExchangeDAOImpl.SELECT_MEX_IDS_BY_PROCESS, query="select m._id from MessageExchangeDAOImpl as m where m._process = :process") }) public class MessageExchangeDAOImpl extends OpenJPADAO implements MessageExchangeDAO, CorrelatorMessageDAO { - private static final Log __log = LogFactory.getLog(MessageExchangeDAOImpl.class); + private static final Logger __log = LoggerFactory.getLogger(MessageExchangeDAOImpl.class); public final static String DELETE_MEXS_BY_PROCESS = "DELETE_MEXS_BY_PROCESS"; public final static String SELECT_MEX_IDS_BY_PROCESS = "SELECT_MEX_IDS_BY_PROCESS"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java index cdf8114..32ddc09 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java @@ -18,8 +18,8 @@ */ package org.apache.ode.dao.jpa; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.openjpa.persistence.OpenJPAPersistence; import org.apache.openjpa.persistence.OpenJPAQuery; @@ -34,7 +34,7 @@ import java.util.List; * @author Matthieu Riou <mriou at apache dot org> */ public class OpenJPADAO { - private static final Log __log = LogFactory.getLog(OpenJPADAO.class); + private static final Logger __log = LoggerFactory.getLogger(OpenJPADAO.class); protected BPELDAOConnectionImpl getConn() { return BPELDAOConnectionFactoryImpl._connections.get(); @@ -75,4 +75,4 @@ public class OpenJPADAO { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java index fa1eddb..2b22d08 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java @@ -19,8 +19,8 @@ package org.apache.ode.dao.jpa; -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.common.CorrelationKey; import org.apache.ode.bpel.common.ProcessState; import org.apache.ode.bpel.dao.CorrelatorDAO; @@ -47,7 +47,7 @@ import java.util.List; @NamedQuery(name="CorrelatorByKey", query="select c from CorrelatorDAOImpl as c where c._correlatorKey = :ckey and c._process = :process") }) public class ProcessDAOImpl extends OpenJPADAO implements ProcessDAO { - private static final Log __log = LogFactory.getLog(ProcessDAOImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ProcessDAOImpl.class); @Id @Column(name="ID") @GeneratedValue(strategy= GenerationType.AUTO) @@ -226,4 +226,4 @@ public class ProcessDAOImpl extends OpenJPADAO implements ProcessDAO { qry.setParameter("state", ProcessState.STATE_ACTIVE); return qry.getResultList(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java index 7d4c9b6..641a562 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java @@ -19,8 +19,8 @@ package org.apache.ode.dao.jpa; -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.common.ProcessState; import org.apache.ode.bpel.dao.ActivityRecoveryDAO; import org.apache.ode.bpel.dao.BpelDAOConnection; @@ -75,7 +75,7 @@ import java.util.Set; query="select i._process._processId, count(i._instanceId) from ProcessInstanceDAOImpl as i where i._process._processId in (:processIds) and i._state in(:states) group by i._process._processId") }) public class ProcessInstanceDAOImpl extends OpenJPADAO implements ProcessInstanceDAO { - private static final Log __log = LogFactory.getLog(ProcessInstanceDAOImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ProcessInstanceDAOImpl.class); public final static String DELETE_INSTANCES_BY_PROCESS = "DELETE_INSTANCES_BY_PROCESS"; public final static String SELECT_INSTANCE_IDS_BY_PROCESS = "SELECT_INSTANCE_IDS_BY_PROCESS"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java index 11ff2f8..241f863 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java @@ -29,8 +29,8 @@ import javax.persistence.EntityManager; import javax.persistence.Query; 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.bpel.common.InstanceFilter; import org.apache.ode.bpel.common.InstanceFilter.StatusKeys; import org.apache.ode.bpel.dao.BpelDAOConnection; @@ -38,7 +38,7 @@ import org.apache.ode.bpel.dao.ProcessInstanceDAO; import org.apache.ode.bpel.dao.ProcessManagementDAO; public class ProcessManagementDAOImpl implements ProcessManagementDAO { - private static final Log __log = LogFactory.getLog(ProcessManagementDAOImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ProcessManagementDAOImpl.class); private EntityManager em; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index d47e4bc..ce90232 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -103,6 +103,7 @@ KARAF = [ :under=>"org.apache.felix", :version=>"0.6.1") ] LOG4J = "log4j:log4j:jar:1.2.17" +LOG4J2 = group("log4j-api", "log4j-core", "log4j-slf4j-impl", "log4j-web", :under=>"org.apache.logging.log4j", :version=>"2.3") OPENJPA = ["org.apache.openjpa:openjpa:jar:1.2.3", "net.sourceforge.serp:serp:jar:1.13.1"] @@ -134,7 +135,7 @@ SERVICEMIX = [ "commons-beanutils:commons-beanutils:jar:1.7.0", "tranql:tranql-connector-derby-common:jar:1.1" ] -SLF4J = group(%w{ slf4j-api slf4j-log4j12 jcl104-over-slf4j }, :under=>"org.slf4j", :version=>"1.4.3") +SLF4J = group(%w{ slf4j-api jcl-over-slf4j}, :under=>"org.slf4j", :version=>"1.7.12") SPRING = ["org.springframework:spring:jar:2.5.6"] SPRING_OSGI = ["org.springframework.osgi:spring-osgi-core:jar:1.2.0"] SPRING_TEST = ["org.springframework:spring-test:jar:2.5.6"] http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java b/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java index b10b92a..44ec8ca 100644 --- a/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java +++ b/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java @@ -116,8 +116,8 @@ class ChannelTypeAnnotationProcessor implements AnnotationProcessor { pw.println(); pw.println("package " + c.getPackage().getQualifiedName() + ";"); pw.println(); - pw.println("import org.apache.commons.logging.LogFactory;"); - pw.println("import org.apache.commons.logging.Log;"); + pw.println("import org.slf4j.LoggerFactory;"); + pw.println("import org.slf4j.Logger;"); pw.println(); pw.println("/**"); pw.println(" * An auto-generated channel listener abstract class for the "); @@ -130,9 +130,9 @@ class ChannelTypeAnnotationProcessor implements AnnotationProcessor { pw.println(" implements " + c.getQualifiedName()); pw.println("{"); pw.println(); - pw.println(" private static final Log __log = LogFactory.getLog(" + c.getQualifiedName() + ".class);"); + pw.println(" private static final Logger __log = LoggerFactory.getLogger(" + c.getQualifiedName() + ".class);"); pw.println(); - pw.println(" protected Log log() { return __log; } " ); + pw.println(" protected Logger log() { return __log; } " ); pw.println(); pw.println(" protected " + c.getSimpleName() + "ChannelListener(" + c.getQualifiedName() + "Channel channel) {"); pw.println(" super(channel);"); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java b/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java index 7263756..267c92b 100644 --- a/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java +++ b/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java @@ -23,15 +23,15 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base-class for method-list objects. Method-lists objects should extends this * class <em>and</em> implement one <code>Channel</code> interface. */ public abstract class ChannelListener<CT extends Channel> extends JacobObject { - private static Log __log = LogFactory.getLog(ChannelListener.class); + private static Logger __log = LoggerFactory.getLogger(ChannelListener.class); private transient Set<Method> _implementedMethods; @@ -108,7 +108,7 @@ public abstract class ChannelListener<CT extends Channel> extends JacobObject { return buf.toString(); } - protected Log log() { + protected Logger log() { return __log; } } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java b/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java index 37d2bd7..7ffbc93 100644 --- a/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java +++ b/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java @@ -18,8 +18,8 @@ */ package org.apache.ode.jacob.vpu; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.jacob.Channel; import org.apache.ode.jacob.ChannelListener; import org.apache.ode.jacob.IndexedObject; @@ -64,7 +64,7 @@ import java.util.zip.GZIPOutputStream; */ public class ExecutionQueueImpl implements ExecutionQueue { /** Class-level logger. */ - private static final Log __log = LogFactory.getLog(ExecutionQueueImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ExecutionQueueImpl.class); private ClassLoader _classLoader; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java b/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java index 2a20fdd..1ea83d6 100644 --- a/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java +++ b/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java @@ -18,8 +18,8 @@ */ package org.apache.ode.jacob.vpu; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.ode.jacob.*; import org.apache.ode.jacob.soup.*; import org.apache.ode.utils.CollectionUtils; @@ -38,7 +38,7 @@ import java.util.Stack; * @author Maciej Szefler <a href="mailto:[email protected]"; /> */ public final class JacobVPU { - private static final Log __log = LogFactory.getLog(JacobVPU.class); + private static final Logger __log = LoggerFactory.getLogger(JacobVPU.class); /** * Internationalization messages. http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java ---------------------------------------------------------------------- diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java index 5355ba7..a914bfb 100644 --- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java +++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java @@ -22,8 +22,8 @@ package org.apache.ode.karaf.commands; import java.util.*; import java.util.concurrent.TimeoutException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.felix.gogo.commands.*; import org.apache.ode.bpel.pmapi.*; import org.apache.ode.bpel.pmapi.TScopeInfo.Activities; @@ -36,7 +36,7 @@ import org.apache.ode.bpel.pmapi.TScopeInfo.Activities; @Command(scope = "ode", name = "list", description = "Lists ode processes and active instances") public class OdeListCommand extends OdeCommandsBase { - private static final Log __log = LogFactory.getLog(OdeListCommand.class); + private static final Logger __log = LoggerFactory.getLogger(OdeListCommand.class); @Option(name = "-a", aliases = "--all", description = "Show all (even completed) instances") private boolean showAll; @@ -117,7 +117,7 @@ public class OdeListCommand extends OdeCommandsBase { collectFailedActivities(scopeInfo, failedActivites); } } catch (Exception e) { - __log.error(e); + __log.error("",e); } return failedActivites; } @@ -131,7 +131,7 @@ public class OdeListCommand extends OdeCommandsBase { return scopeInfoDoc.getScopeInfo(); } } catch (Exception e) { - __log.error(e); + __log.error("",e); } } return null; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeRecoverActivityCommand.java ---------------------------------------------------------------------- diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeRecoverActivityCommand.java b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeRecoverActivityCommand.java index 41002b8..b092463 100644 --- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeRecoverActivityCommand.java +++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeRecoverActivityCommand.java @@ -19,13 +19,13 @@ package org.apache.ode.karaf.commands; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.felix.gogo.commands.*; @Command(scope = "ode", name = "recoverActivity", description = "Recover a failed BPEL activity in ODE") public class OdeRecoverActivityCommand extends OdeCommandsBase { - private static final Log __log = LogFactory.getLog(OdeRecoverActivityCommand.class); + private static final Logger __log = LoggerFactory.getLogger(OdeRecoverActivityCommand.class); private static final String RETRY = "retry"; private static final String FAULT = "fault"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeResumeCommand.java ---------------------------------------------------------------------- diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeResumeCommand.java b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeResumeCommand.java index b87c2f4..cb47265 100644 --- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeResumeCommand.java +++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeResumeCommand.java @@ -22,15 +22,15 @@ package org.apache.ode.karaf.commands; import java.util.List; import java.util.concurrent.TimeoutException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.felix.gogo.commands.*; import org.apache.ode.bpel.pmapi.TInstanceInfo; @Command(scope = "ode", name = "resume", description = "Resume suspended ODE process instances") public class OdeResumeCommand extends OdeCommandsBase { - private static final Log __log = LogFactory.getLog(OdeResumeCommand.class); + private static final Logger __log = LoggerFactory.getLogger(OdeResumeCommand.class); @Argument(name = "iids", description = "Instance IDs to resume", multiValued = true) private static Long[] iids; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeSuspendCommand.java ---------------------------------------------------------------------- diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeSuspendCommand.java b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeSuspendCommand.java index 584014e..ec7cd20 100644 --- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeSuspendCommand.java +++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeSuspendCommand.java @@ -22,15 +22,15 @@ package org.apache.ode.karaf.commands; import java.util.List; import java.util.concurrent.TimeoutException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.felix.gogo.commands.*; import org.apache.ode.bpel.pmapi.TInstanceInfo; @Command(scope = "ode", name = "suspend", description = "Suspend active ODE process instances") public class OdeSuspendCommand extends OdeCommandsBase { - private static final Log __log = LogFactory.getLog(OdeSuspendCommand.class); + private static final Logger __log = LoggerFactory.getLogger(OdeSuspendCommand.class); @Argument(name = "iids", description = "Instance IDs to suspend", multiValued = true) private static Long[] iids; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeTerminateCommand.java ---------------------------------------------------------------------- diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeTerminateCommand.java b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeTerminateCommand.java index 01d6a0b..52699ce 100644 --- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeTerminateCommand.java +++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeTerminateCommand.java @@ -22,15 +22,15 @@ package org.apache.ode.karaf.commands; import java.util.List; import java.util.concurrent.TimeoutException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.felix.gogo.commands.*; import org.apache.ode.bpel.pmapi.TInstanceInfo; @Command(scope = "ode", name = "terminate", description = "Terminate active ODE process instances") public class OdeTerminateCommand extends OdeCommandsBase { - private static final Log __log = LogFactory.getLog(OdeTerminateCommand.class); + private static final Logger __log = LoggerFactory.getLogger(OdeTerminateCommand.class); @Argument(name = "iids", description = "Instance IDs to terminate", multiValued = true) private static Long[] iids; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java b/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java index ecebf7c..263ad8a 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java +++ b/jbi/src/main/java/org/apache/ode/jbi/BaseMessageExchangeProcessor.java @@ -26,15 +26,15 @@ import javax.jbi.messaging.MessageExchange; import javax.jbi.messaging.MessagingException; import javax.jbi.messaging.NormalizedMessage; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base message exchange processor; handles common JBI message exchange conditions and delegates * actual invocation to subclass. */ public abstract class BaseMessageExchangeProcessor implements JbiMessageExchangeProcessor { - final Log LOG = LogFactory.getLog(getClass()); + final Logger LOG = LoggerFactory.getLogger(getClass()); DeliveryChannel _channel; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java b/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java index dbdf738..8f2cc8d 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java +++ b/jbi/src/main/java/org/apache/ode/jbi/BindingContextImpl.java @@ -24,8 +24,8 @@ import java.util.Map; import javax.wsdl.PortType; 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.bpel.iapi.BindingContext; import org.apache.ode.bpel.iapi.ContextException; import org.apache.ode.bpel.iapi.Endpoint; @@ -40,7 +40,7 @@ import org.apache.ode.bpel.iapi.PartnerRoleChannel; * */ class BindingContextImpl implements BindingContext { - private static final Log __log = LogFactory.getLog(BindingContextImpl.class); + private static final Logger __log = LoggerFactory.getLogger(BindingContextImpl.class); private final OdeContext _ode; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java b/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java index 6762dba..8c3e055 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java +++ b/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java @@ -22,8 +22,8 @@ package org.apache.ode.jbi; import javax.jbi.servicedesc.ServiceEndpoint; 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.bpel.iapi.EndpointReference; import org.apache.ode.bpel.iapi.EndpointReferenceContext; import org.apache.ode.bpel.epr.MutableEndpoint; @@ -49,7 +49,7 @@ import java.util.HashMap; * */ public class EndpointReferenceContextImpl implements EndpointReferenceContext { - private static final Log __log = LogFactory.getLog(EndpointReferenceContextImpl.class); + private static final Logger __log = LoggerFactory.getLogger(EndpointReferenceContextImpl.class); private final OdeContext _ode; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java b/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java index de9b470..5ac7dfc 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java +++ b/jbi/src/main/java/org/apache/ode/jbi/JbiMessageExchangeEventRouter.java @@ -23,15 +23,15 @@ import javax.jbi.messaging.MessageExchange; import javax.jbi.messaging.MessagingException; 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.bpel.iapi.Endpoint; /** * Route incoming JBI messages to Ode services */ class JbiMessageExchangeEventRouter implements JbiMessageExchangeProcessor { - private static final Log __log = LogFactory.getLog(JbiMessageExchangeEventRouter.class); + private static final Logger __log = LoggerFactory.getLogger(JbiMessageExchangeEventRouter.class); private OdeContext _ode; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java b/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java index c709f17..5bb0a1c 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java +++ b/jbi/src/main/java/org/apache/ode/jbi/MessageExchangeContextImpl.java @@ -20,8 +20,8 @@ package org.apache.ode.jbi; -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.BpelEngineException; import org.apache.ode.bpel.iapi.ContextException; @@ -37,8 +37,7 @@ import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; */ public class MessageExchangeContextImpl implements MessageExchangeContext { - private static final Log __log = LogFactory - .getLog(MessageExchangeContextImpl.class); + private static final Logger __log = LoggerFactory.getLogger(MessageExchangeContextImpl.class); private OdeContext _ode; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java b/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java index f3e2a18..694c0d5 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java @@ -34,15 +34,15 @@ import java.util.concurrent.ConcurrentHashMap; import javax.jbi.messaging.*; import javax.jbi.servicedesc.ServiceEndpoint; 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; /** * Bridge between ODE (consumers) and JBI (providers). An single object of this type handles all communications initiated by ODE * that is destined for other JBI providers. */ abstract class OdeConsumer extends ServiceBridge implements JbiMessageExchangeProcessor { - private static final Log __log = LogFactory.getLog(OdeConsumer.class); + private static final Logger __log = LoggerFactory.getLogger(OdeConsumer.class); private static final long DEFAULT_RESPONSE_TIMEOUT = Long.getLong("org.apache.ode.jbi.timeout", 2 * 60 * 1000L); protected OdeContext _ode; @@ -232,7 +232,7 @@ abstract class OdeConsumer extends ServiceBridge implements JbiMessageExchangePr .getName()), faultResponse); } else { // Can this even happen? - __log.fatal("Internal Error: fault found without a message type: " + wsdlFlt); + __log.error("Internal Error: fault found without a message type: " + wsdlFlt); pmex.replyWithFailure(FailureType.FORMAT_ERROR, "Fault has no message: " + wsdlFlt.getName(), null); } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerAsync.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerAsync.java b/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerAsync.java index 972348a..b788909 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerAsync.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerAsync.java @@ -31,8 +31,8 @@ import javax.jbi.messaging.InOnly; import javax.jbi.messaging.InOut; import javax.jbi.messaging.MessagingException; -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.PartnerRoleMessageExchange; import org.apache.ode.bpel.iapi.MessageExchange.FailureType; @@ -40,7 +40,7 @@ import org.apache.ode.bpel.iapi.MessageExchange.FailureType; * Asynchronous JBI service consumer */ class OdeConsumerAsync extends OdeConsumer { - private static final Log __log = LogFactory.getLog(OdeConsumerAsync.class); + private static final Logger __log = LoggerFactory.getLogger(OdeConsumerAsync.class); /** * We create an executor to handle all the asynchronous invocations/timeouts. Note, we don't need a lot of threads http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerSync.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerSync.java b/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerSync.java index 44719f8..3a34945 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerSync.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeConsumerSync.java @@ -23,8 +23,8 @@ import javax.jbi.messaging.InOnly; import javax.jbi.messaging.InOut; import javax.jbi.messaging.MessagingException; -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.PartnerRoleMessageExchange; /** @@ -34,7 +34,7 @@ import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; * */ class OdeConsumerSync extends OdeConsumer { - private static final Log __log = LogFactory.getLog(OdeConsumerSync.class); + private static final Logger __log = LoggerFactory.getLogger(OdeConsumerSync.class); OdeConsumerSync(OdeContext ode) { http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java b/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java index 920a232..8b30a6c 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java @@ -37,8 +37,8 @@ import javax.wsdl.Operation; import javax.wsdl.factory.WSDLFactory; 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.agents.memory.SizingAgent; import org.apache.ode.bpel.dao.BpelDAOConnectionFactory; import org.apache.ode.bpel.engine.BpelServerImpl; @@ -63,7 +63,7 @@ import org.w3c.dom.Document; * @author mszefler */ final public class OdeContext { - private static final Log __log = LogFactory.getLog(OdeContext.class); + private static final Logger __log = LoggerFactory.getLogger(OdeContext.class); public static final QName PM_SERVICE_NAME = new QName("http://www.apache.org/ode/pmapi";, "ProcessManagementService"); public static final String PM_PORT_NAME = "ProcessManagementPort"; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java b/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java index e5c02ca..e29fc66 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java @@ -31,8 +31,8 @@ import javax.management.MBeanServer; import javax.management.ObjectName; 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.geronimo.transaction.manager.GeronimoTransactionManager; import org.apache.ode.bpel.connector.BpelServerConnector; import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC; @@ -57,7 +57,7 @@ import org.apache.ode.utils.fs.TempFileManager; public class OdeLifeCycle implements ComponentLifeCycle { private static final Messages __msgs = Messages.getMessages(Messages.class); - private static final Log __log = LogFactory.getLog(OdeLifeCycle.class); + private static final Logger __log = LoggerFactory.getLogger(OdeLifeCycle.class); private OdeSUManager _suManager = null; @@ -148,7 +148,7 @@ public class OdeLifeCycle implements ComponentLifeCycle { _initSuccess = true; __log.info(__msgs.msgOdeInitialized()); } catch (Throwable t) { - __log.fatal("", t); + __log.error("", t); throw new JBIException("Fatal error", t); } } @@ -379,7 +379,7 @@ public class OdeLifeCycle implements ComponentLifeCycle { if (!_initSuccess) { String errmsg = "attempt to call start() after init() failure."; IllegalStateException ex = new IllegalStateException(errmsg); - __log.fatal(errmsg, ex); + __log.error(errmsg, ex); throw new JBIException(errmsg, ex); } @@ -423,7 +423,7 @@ public class OdeLifeCycle implements ComponentLifeCycle { try { _receiver.cease(); } catch (Exception ex) { - __log.fatal("Error ceasing receiver.", ex); + __log.error("Error ceasing receiver.", ex); } finally { _receiver = null; } @@ -433,7 +433,7 @@ public class OdeLifeCycle implements ComponentLifeCycle { _ode._server.stop(); } catch (Throwable ex) { - __log.fatal("Error stopping services.", ex); + __log.error("Error stopping services.", ex); } __log.info("ODE stopped."); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java b/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java index d8f249b..d5bd7f5 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java @@ -27,8 +27,8 @@ import javax.jbi.management.DeploymentException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -36,7 +36,7 @@ import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.XMLParserUtils; public class OdeSUManager implements ServiceUnitManager { - private static final Log __log = LogFactory.getLog(OdeSUManager.class); + private static final Logger __log = LoggerFactory.getLogger(OdeSUManager.class); private static final Messages __msgs = Messages.getMessages(Messages.class); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeService.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeService.java b/jbi/src/main/java/org/apache/ode/jbi/OdeService.java index 0489d8e..080e836 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeService.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeService.java @@ -18,8 +18,8 @@ */ package org.apache.ode.jbi; -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.Endpoint; import org.apache.ode.bpel.iapi.Message; import org.apache.ode.bpel.iapi.MessageExchange; @@ -47,7 +47,7 @@ import java.util.Map; */ public class OdeService extends ServiceBridge implements JbiMessageExchangeProcessor { - private static final Log __log = LogFactory.getLog(OdeService.class); + private static final Logger __log = LoggerFactory.getLogger(OdeService.class); /** utility for tracking outstanding JBI message exchanges. */ private final JbiMexTracker _jbiMexTracker = new JbiMexTracker(); @@ -118,7 +118,7 @@ public class OdeService extends ServiceBridge implements JbiMessageExchangeProce public void onJbiMessageExchange(javax.jbi.messaging.MessageExchange jbiMex) throws MessagingException { if (jbiMex.getRole() != javax.jbi.messaging.MessageExchange.Role.PROVIDER) { String errmsg = "Message exchange is not in PROVIDER role as expected: " + jbiMex.getExchangeId(); - __log.fatal(errmsg); + __log.error(errmsg); throw new IllegalArgumentException(errmsg); } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java b/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java index 7ad393d..e9f4c3e 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java @@ -31,15 +31,15 @@ import java.util.List; import javax.jbi.management.DeploymentException; 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; /** * Representation of a JBI service unit. A JBI service unit may actually consist * of multiple processes. */ class OdeServiceUnit { - private static final Log __log = LogFactory.getLog(OdeServiceUnit.class); + private static final Logger __log = LoggerFactory.getLogger(OdeServiceUnit.class); private static final Messages __msgs = Messages.getMessages(Messages.class); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/Receiver.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/Receiver.java b/jbi/src/main/java/org/apache/ode/jbi/Receiver.java index 9a81ac9..655d231 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/Receiver.java +++ b/jbi/src/main/java/org/apache/ode/jbi/Receiver.java @@ -18,8 +18,8 @@ */ package org.apache.ode.jbi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.jbi.messaging.DeliveryChannel; import javax.jbi.messaging.MessageExchange; @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * Receiver pulls messages from the NMS and submits them to ODE for further processing. */ public class Receiver implements Runnable { - private static final Log __log = LogFactory.getLog(Receiver.class); + private static final Logger __log = LoggerFactory.getLogger(Receiver.class); // default time to wait for MessageExchanges, in seconds private static final long ACCEPT_TIMEOUT = 1L; @@ -111,7 +111,7 @@ public class Receiver implements Runnable { // If it's not dead yet, we got a problem we can't deal with. if (_thread.isAlive()) { - __log.fatal("Receiver thread is not dying gracefully despite our insistence!."); + __log.error("Receiver thread is not dying gracefully despite our insistence!."); } // In any case, next step is to shutdown the thread pool @@ -150,11 +150,11 @@ public class Receiver implements Runnable { try { _channel = _odeContext.getContext().getDeliveryChannel(); if (_channel == null) { - __log.fatal("No Channel!"); + __log.error("No Channel!"); return; } } catch (MessagingException ex) { - __log.fatal("Error getting channel! ", ex); + __log.error("Error getting channel! ", ex); return; } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/ServiceBridge.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/ServiceBridge.java b/jbi/src/main/java/org/apache/ode/jbi/ServiceBridge.java index 8f12e0f..ddab5ed 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/ServiceBridge.java +++ b/jbi/src/main/java/org/apache/ode/jbi/ServiceBridge.java @@ -22,8 +22,8 @@ import java.util.Set; import javax.jbi.messaging.NormalizedMessage; -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.MessageExchange; import org.apache.ode.bpel.iapi.MyRoleMessageExchange; import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; @@ -36,7 +36,7 @@ import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; */ public class ServiceBridge { - private static final Log __log = LogFactory.getLog(ServiceBridge.class); + private static final Logger __log = LoggerFactory.getLogger(ServiceBridge.class); /** * Transfer message properties from the ODE message exchange to the JBI message exchange object. http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/msgmap/BaseXmlMapper.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/msgmap/BaseXmlMapper.java b/jbi/src/main/java/org/apache/ode/jbi/msgmap/BaseXmlMapper.java index 66ecf61..6103c4f 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/msgmap/BaseXmlMapper.java +++ b/jbi/src/main/java/org/apache/ode/jbi/msgmap/BaseXmlMapper.java @@ -25,14 +25,14 @@ import java.util.WeakHashMap; import javax.xml.transform.Source; -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.Element; public abstract class BaseXmlMapper { - protected Log __log = LogFactory.getLog(getClass()); + protected Logger __log = LoggerFactory.getLogger(getClass()); /** Cache of the parsed messages. */ private static Map<Source, Document> __parsed = Collections.synchronizedMap(new WeakHashMap<Source, Document>()); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java b/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java index 91f1fe0..bf24d93 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java +++ b/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java @@ -170,7 +170,7 @@ public class JbiWsdl11WrapperMapper extends BaseXmlMapper implements Mapper { QName elName = new QName(n.getNamespaceURI(),n.getLocalName()); if (!elName.equals(partElName)) { String err = "Invalid NMS message format, expected " + partElName + " but found " + elName; - __log.error(err); + __log.error("",err); throw new MessageTranslationException(err); } Element pdata = DOMUtils.getFirstChildElement((Element) n); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/util/SchemaCollection.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/util/SchemaCollection.java b/jbi/src/main/java/org/apache/ode/jbi/util/SchemaCollection.java index 821b40d..68ff20c 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/util/SchemaCollection.java +++ b/jbi/src/main/java/org/apache/ode/jbi/util/SchemaCollection.java @@ -27,8 +27,8 @@ import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -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.XMLParserUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -43,7 +43,7 @@ import org.xml.sax.InputSource; */ public class SchemaCollection { - private static Log log = LogFactory.getLog(SchemaCollection.class); + private static Logger log = LoggerFactory.getLogger(SchemaCollection.class); private Map schemas; private URI baseUri; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/main/java/org/apache/ode/jbi/util/WSDLFlattener.java ---------------------------------------------------------------------- diff --git a/jbi/src/main/java/org/apache/ode/jbi/util/WSDLFlattener.java b/jbi/src/main/java/org/apache/ode/jbi/util/WSDLFlattener.java index 56d5945..3dff802 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/util/WSDLFlattener.java +++ b/jbi/src/main/java/org/apache/ode/jbi/util/WSDLFlattener.java @@ -38,14 +38,14 @@ import javax.wsdl.extensions.schema.SchemaImport; import javax.wsdl.factory.WSDLFactory; 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 com.ibm.wsdl.extensions.schema.SchemaImpl; public class WSDLFlattener { - private static Log __log = LogFactory.getLog(WSDLFlattener.class); + private static Logger __log = LoggerFactory.getLogger(WSDLFlattener.class); private Definition _definition; private SchemaCollection _schemas; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java ---------------------------------------------------------------------- diff --git a/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java b/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java index 251eb18..97ec81c 100644 --- a/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java +++ b/jbi/src/test/java/org/apache/ode/jbi/JbiTestBase.java @@ -37,8 +37,8 @@ import javax.transaction.TransactionManager; import javax.xml.namespace.QName; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.servicemix.client.DefaultServiceMixClient; import org.apache.servicemix.jbi.container.ActivationSpec; import org.apache.servicemix.jbi.container.JBIContainer; @@ -53,7 +53,7 @@ import org.springframework.context.support.AbstractXmlApplicationContext; @Ignore public class JbiTestBase extends SpringTestSupport { - private static Log log = LogFactory.getLog(JbiTestBase.class); + private static Logger log = LoggerFactory.getLogger(JbiTestBase.class); protected OdeComponent odeComponent; protected JBIContainer jbiContainer; @@ -228,4 +228,4 @@ public class JbiTestBase extends SpringTestSupport { FileUtil.copyInputStream(is, baos); return baos.toString(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/jbi/src/test/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapperTest.java ---------------------------------------------------------------------- diff --git a/jbi/src/test/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapperTest.java b/jbi/src/test/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapperTest.java index eac2631..b0e1885 100644 --- a/jbi/src/test/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapperTest.java +++ b/jbi/src/test/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapperTest.java @@ -30,12 +30,12 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import org.apache.commons.io.IOUtils; -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; public class JbiWsdl11WrapperMapperTest extends junit.framework.TestCase { - private static Log __log = LogFactory.getLog(JbiWsdl11WrapperMapperTest.class); + private static Logger __log = LoggerFactory.getLogger(JbiWsdl11WrapperMapperTest.class); public static class MockJbiFault implements javax.jbi.messaging.Fault { private String resourceName;
