http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ScopeFrame.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ScopeFrame.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ScopeFrame.java index 0af1f6d..b7efa6d 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ScopeFrame.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ScopeFrame.java @@ -18,8 +18,8 @@ */ package org.apache.ode.bpel.runtime; -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.FaultException; import org.apache.ode.bpel.evt.ScopeEvent; import org.apache.ode.bpel.iapi.BpelEngineException; @@ -49,7 +49,7 @@ import javax.xml.namespace.QName; */ class ScopeFrame implements Serializable { private static final long serialVersionUID = 1L; - private static final Log __log = LogFactory.getLog(ScopeFrame.class); + private static final Logger __log = LoggerFactory.getLogger(ScopeFrame.class); /** The compiled scope representation. */ final OScope oscope;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java index 3917837..1d1ac78 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java @@ -21,8 +21,8 @@ package org.apache.ode.bpel.runtime; import org.apache.ode.bpel.common.FaultException; import org.apache.ode.bpel.obj.OThrow; import org.apache.ode.bpel.runtime.channels.FaultData; -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; import org.w3c.dom.Node; @@ -33,7 +33,7 @@ import org.w3c.dom.Node; */ class THROW extends ACTIVITY { private static final long serialVersionUID = 1L; - private static final Log __log = LogFactory.getLog(ACTIVITY.class); + private static final Logger __log = LoggerFactory.getLogger(ACTIVITY.class); private OThrow _othrow; @@ -51,7 +51,7 @@ class THROW extends ACTIVITY { fault = createFault(_othrow.getFaultName(), (Element)faultVariable,_othrow.getFaultVariable().getType(),_othrow); } catch (FaultException e) { // deal with this as a fault (just not the one we hoped for) - __log.error(e); + __log.error("",e); fault = createFault(e.getQName(), _othrow); } }else{ http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java index 7c40939..411a307 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java @@ -21,8 +21,8 @@ package org.apache.ode.bpel.runtime; import java.util.Calendar; import java.util.Date; -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.FaultException; import org.apache.ode.bpel.explang.EvaluationContext; import org.apache.ode.bpel.explang.EvaluationException; @@ -40,7 +40,7 @@ import static org.apache.ode.jacob.ProcessUtil.compose; */ class WAIT extends ACTIVITY { private static final long serialVersionUID = 1L; - private static final Log __log = LogFactory.getLog(WAIT.class); + private static final Logger __log = LoggerFactory.getLogger(WAIT.class); WAIT(ActivityInfo self, ScopeFrame scopeFrame, LinkFrame linkFrame) { super(self, scopeFrame, linkFrame); http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java index c6afa74..4f97fde 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java @@ -21,8 +21,8 @@ package org.apache.ode.bpel.runtime; 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; import org.apache.ode.bpel.common.FaultException; import org.apache.ode.bpel.explang.EvaluationException; import org.apache.ode.bpel.obj.OScope; @@ -43,7 +43,7 @@ import static org.apache.ode.jacob.ProcessUtil.compose; class WHILE extends ACTIVITY { private static final long serialVersionUID = 1L; - private static final Log __log = LogFactory.getLog(WHILE.class); + private static final Logger __log = LoggerFactory.getLogger(WHILE.class); private Set<CompensationHandler> _compHandlers = new HashSet<CompensationHandler>(); @@ -58,7 +58,7 @@ class WHILE extends ACTIVITY { try { condResult = checkCondition(); } catch (FaultException fe) { - __log.error(fe); + __log.error("",fe); _self.parent.completed(createFault(fe.getQName(), _self.o),_compHandlers); return; } @@ -81,7 +81,7 @@ class WHILE extends ACTIVITY { return "<T:Act:While:" + _self.o + ">"; } - protected Log log() { + protected Logger log() { return __log; } http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XsdTypesTest.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XsdTypesTest.java b/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XsdTypesTest.java index 60129e5..f86510a 100644 --- a/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XsdTypesTest.java +++ b/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XsdTypesTest.java @@ -25,20 +25,20 @@ import javax.xml.xpath.XPathFactory; import net.sf.saxon.Configuration; import net.sf.saxon.xpath.XPathFactoryImpl; -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 junit.framework.TestCase; public class XsdTypesTest extends TestCase { - private static Log __log = LogFactory.getLog(XsdTypesTest.class); + private static Logger __log = LoggerFactory.getLogger(XsdTypesTest.class); public void testDateTime() throws Exception { XPathFactoryImpl xpf = new XPathFactoryImpl(); JaxpVariableResolver jvr = new JaxpVariableResolver(null, null, xpf.getConfiguration()); Object o = jvr.getSimpleContent(DOMUtils.stringToDOM("<temporary-simple-type-wrapper>2010-01-25T15:38:54.82Z</temporary-simple-type-wrapper>"), QName.valueOf("{http://www.w3.org/2001/XMLSchema}dateTime";)); - __log.debug(o); + __log.debug("",o); assertTrue(o.toString().contains("2010-01-25T15:38:54.82Z")); } @@ -46,7 +46,7 @@ public class XsdTypesTest extends TestCase { XPathFactoryImpl xpf = new XPathFactoryImpl(); JaxpVariableResolver jvr = new JaxpVariableResolver(null, null, xpf.getConfiguration()); Object o = jvr.getSimpleContent(DOMUtils.stringToDOM("<temporary-simple-type-wrapper></temporary-simple-type-wrapper>"), QName.valueOf("{http://www.w3.org/2001/XMLSchema}dateTime";)); - __log.debug(o); + __log.debug("",o); assertTrue(o.toString().equals("")); } } http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/test/resources/log4j2.xml b/bpel-runtime/src/test/resources/log4j2.xml new file mode 100644 index 0000000..9f6bc53 --- /dev/null +++ b/bpel-runtime/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> http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-store/src/main/java/org/apache/ode/store/ClusterProcessStoreImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ClusterProcessStoreImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ClusterProcessStoreImpl.java index d701e23..207c9df 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ClusterProcessStoreImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ClusterProcessStoreImpl.java @@ -18,8 +18,8 @@ */ package org.apache.ode.store; -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.clapi.ClusterManager; import org.apache.ode.bpel.clapi.ClusterProcessStore; import org.apache.ode.bpel.clapi.ProcessStoreDeployedEvent; @@ -38,7 +38,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class ClusterProcessStoreImpl extends ProcessStoreImpl implements ClusterProcessStore { - private static final Log __log = LogFactory.getLog(ClusterProcessStoreImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ClusterProcessStoreImpl.class); private ClusterManager _clusterManager; private ProcessStoreDeployedEvent deployedEvent; http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java b/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java index 3c5e577..b8a6d16 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java +++ b/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java @@ -37,8 +37,8 @@ import javax.wsdl.WSDLException; import javax.wsdl.xml.WSDLReader; 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.compiler.BpelC; import org.apache.ode.bpel.compiler.BpelCompiler; import org.apache.ode.bpel.compiler.DefaultResourceFinder; @@ -71,7 +71,7 @@ import org.w3c.dom.Node; class DeploymentUnitDir { - private static Log __log = LogFactory.getLog(DeploymentUnitDir.class); + private static Logger __log = LoggerFactory.getLogger(DeploymentUnitDir.class); private String _name; private File _duDirectory; http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java b/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java index 7467d6f..49066ef 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java +++ b/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java @@ -22,8 +22,8 @@ import java.util.ArrayList; 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.compiler.api.CompilationException; import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL; @@ -31,7 +31,7 @@ import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL; * A parsed collection of WSDL definitions, including BPEL-specific extensions. */ public class DocumentRegistry { - private static final Log __log = LogFactory.getLog(DocumentRegistry.class); + private static final Logger __log = LoggerFactory.getLogger(DocumentRegistry.class); private final ArrayList<Definition4BPEL> _definitions = new ArrayList<Definition4BPEL>(); http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java index c73ced0..12eb267 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java @@ -24,15 +24,15 @@ import java.util.EnumSet; import java.util.List; 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.apache.ode.bpel.dd.TCleanup; import org.apache.ode.bpel.dd.TDeployment; import org.apache.ode.bpel.iapi.ContextException; import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY; public class ProcessCleanupConfImpl { - protected static Log __log = LogFactory.getLog(ProcessCleanupConfImpl.class); + protected static Logger __log = LoggerFactory.getLogger(ProcessCleanupConfImpl.class); private final Set<CLEANUP_CATEGORY> successCategories = EnumSet.noneOf(CLEANUP_CATEGORY.class); private final Set<CLEANUP_CATEGORY> failureCategories = EnumSet.noneOf(CLEANUP_CATEGORY.class); http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java index a0770e9..7209b0c 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java @@ -40,8 +40,8 @@ import java.util.Set; import javax.wsdl.Definition; 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.activityRecovery.FailureHandlingDocument.FailureHandling; import org.apache.ode.bpel.dd.TCleanup; import org.apache.ode.bpel.dd.TDeployment; @@ -78,7 +78,7 @@ import org.w3c.dom.Node; * @author mriou <mriou at apache dot org> */ public class ProcessConfImpl implements ProcessConf { - private static final Log __log = LogFactory.getLog(ProcessConfImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ProcessConfImpl.class); private final Date _deployDate; private File _configDir; @@ -491,7 +491,7 @@ public class ProcessConfImpl implements ProcessConf { if(it.hasNext()) msg.append(", "); } msg.append("}"); - __log.debug(msg); + __log.debug(msg.toString()); } return prop; } http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java index 05252a1..00a7c14 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java @@ -18,8 +18,8 @@ */ package org.apache.ode.store; -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.compiler.api.CompilationException; import org.apache.ode.bpel.dd.DeployDocument; import org.apache.ode.bpel.dd.TDeployment; @@ -65,7 +65,7 @@ import java.util.regex.Pattern; */ public class ProcessStoreImpl implements ProcessStore { - private static final Log __log = LogFactory.getLog(ProcessStoreImpl.class); + private static final Logger __log = LoggerFactory.getLogger(ProcessStoreImpl.class); private static final Messages __msgs = MessageBundle.getMessages(Messages.class); http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java b/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java index a7c7099..22c91a6 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java +++ b/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java @@ -18,8 +18,8 @@ */ package org.apache.ode.store.hib; -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; import org.apache.ode.store.ProcessConfDAO; @@ -40,7 +40,7 @@ import java.util.Date; */ public class ConfStoreConnectionHib implements ConfStoreConnection { - private static final Log __log = LogFactory.getLog(ConfStoreConnectionHib.class); + private static final Logger __log = LoggerFactory.getLogger(ConfStoreConnectionHib.class); private Session _session; static final ThreadLocal<Session> _current = new ThreadLocal<Session>(); http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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 db4e9d0..fec2d30 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 @@ -29,8 +29,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.bpel.iapi.BpelEngineException; import org.apache.ode.daohib.HibernateTransactionManagerLookup; import org.apache.ode.daohib.SessionManager; @@ -47,7 +47,7 @@ import org.hibernate.connection.ConnectionProvider; import org.hibernate.dialect.Dialect; 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); @@ -112,7 +112,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); } } http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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 72a9df9..1fd54ec 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; @@ -34,7 +34,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/573900b7/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 407e18a..91ef7bf 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; @@ -37,7 +37,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; @@ -116,8 +116,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/573900b7/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..9f6bc53 --- /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> http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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 00bdf7d..062b95f 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 @@ -18,8 +18,8 @@ */ package org.apache.ode.test; -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; @@ -61,7 +61,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; 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"; http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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..9f6bc53 --- /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> http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java ---------------------------------------------------------------------- diff --git a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java index 4c5cad5..d969666 100644 --- a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java +++ b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java @@ -38,8 +38,8 @@ import java.io.FileNotFoundException; 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.bpel.clapi.*; @@ -47,7 +47,7 @@ import org.apache.ode.bpel.clapi.*; * This class implements necessary methods to build the cluster using hazelcast */ public class HazelcastClusterImpl implements ClusterManager, ProcessStoreClusterListener { - private static final Log __log = LogFactory.getLog(HazelcastClusterImpl.class); + private static final Logger __log = LoggerFactory.getLogger(HazelcastClusterImpl.class); private HazelcastInstance _hazelcastInstance; private boolean isMaster = false; @@ -88,7 +88,7 @@ public class HazelcastClusterImpl implements ClusterManager, ProcessStoreCluster Config config = loadConfig(hzXml); _hazelcastInstance = Hazelcast.newHazelcastInstance(config); } catch (FileNotFoundException fnf) { - __log.error(fnf); + __log.error("",fnf); } } http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastDeploymentLock.java ---------------------------------------------------------------------- diff --git a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastDeploymentLock.java b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastDeploymentLock.java index b753305..2d22e8a 100644 --- a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastDeploymentLock.java +++ b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastDeploymentLock.java @@ -21,13 +21,13 @@ package org.apache.ode.clustering.hazelcast; import com.hazelcast.core.IMap; import org.apache.ode.bpel.clapi.ClusterLock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; public class HazelcastDeploymentLock implements ClusterLock<String>{ - private static final Log __log = LogFactory.getLog(HazelcastDeploymentLock.class); + private static final Logger __log = LoggerFactory.getLogger(HazelcastDeploymentLock.class); private IMap<String, String> _lock_map; http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastInstanceLock.java ---------------------------------------------------------------------- diff --git a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastInstanceLock.java b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastInstanceLock.java index 8ac11f8..06a686f 100644 --- a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastInstanceLock.java +++ b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastInstanceLock.java @@ -23,11 +23,11 @@ import org.apache.ode.bpel.clapi.ClusterLock; import java.util.concurrent.TimeUnit; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HazelcastInstanceLock implements ClusterLock<Long> { - private static final Log __log = LogFactory.getLog(HazelcastInstanceLock.class); + private static final Logger __log = LoggerFactory.getLogger(HazelcastInstanceLock.class); private IMap<Long, Long> _lock_map; http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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/573900b7/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 c883939..346fc34 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/573900b7/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 2b24c4f..ed8018b 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 @@ -27,8 +27,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; @@ -44,7 +44,7 @@ import org.hibernate.dialect.resolver.DialectFactory; * 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; @@ -73,13 +73,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); } http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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 2342cae..589884a 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); public 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/573900b7/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 b9bfc4d..c4cbd6c 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.*; @@ -45,7 +45,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"; @@ -282,4 +282,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/573900b7/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 c3c3d63..2f349b8 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. http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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 5cb96de..a163fe3 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/573900b7/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 ba79c01..50512bf 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; @@ -51,7 +51,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/573900b7/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 116fa5c..c5fb876 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/573900b7/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 0a0292d..8d7e691 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/573900b7/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/573900b7/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..9f6bc53 --- /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> http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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 89ace41..793a482 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; @@ -43,7 +43,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/573900b7/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 17e7903..ace6bc7 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; http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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/573900b7/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 1278b1d..d214cf8 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/573900b7/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 193f571..95dbefa 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/573900b7/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 16580fc..78a12d6 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/573900b7/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 605e462..aed6af1 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/573900b7/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 7d6bdcb..0ab3d67 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/573900b7/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 5b287a7..08d2ed4 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/573900b7/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index f469c02..69912fb 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -110,6 +110,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") OBJECT_DIFF = "de.danielbechler:java-object-diff:jar:0.13.1" OPENJPA = ["org.apache.openjpa:openjpa:jar:1.2.3", "net.sourceforge.serp:serp:jar:1.13.1"] @@ -142,7 +143,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 jcl-over-slf4j }, :under=>"org.slf4j", :version=>"1.7.2") +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/573900b7/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 6fcd7cf..d7a7e25 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; http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/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/573900b7/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/573900b7/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/573900b7/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/573900b7/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 b8a6a97..a83f937 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/573900b7/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 1b06383..3a49170 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/573900b7/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/573900b7/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 fdba2a7..2510a95 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/573900b7/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 122a4c6..3b1102c 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/573900b7/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 64b9a6d..85d33fa 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/573900b7/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 029ded7..704cbe1 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/573900b7/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 97815cc..0ea3710 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/573900b7/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 c8fed8d..ffa3636 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/573900b7/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 c885d13..950d47e 100644 --- a/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java +++ b/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java @@ -19,8 +19,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.geronimo.transaction.manager.GeronimoTransactionManager; import org.apache.ode.bpel.connector.BpelServerConnector; import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC; @@ -56,7 +56,7 @@ import java.util.concurrent.Executors; 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; @@ -147,7 +147,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); } } @@ -378,7 +378,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); } @@ -422,7 +422,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; } @@ -432,7 +432,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.");
