You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2015/11/26 10:25:10 UTC
[3/5] ode git commit: ODE-983: Migrated to SLF4J and Log4j2
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
index 4954b5c..c59581d 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
@@ -27,8 +27,8 @@ import java.util.Set;
import javax.wsdl.OperationType;
-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.runtime.PartnerLinkInstance;
import org.apache.ode.bpel.runtime.Selector;
import org.apache.ode.utils.ObjectPrinter;
@@ -44,7 +44,7 @@ import org.apache.ode.utils.ObjectPrinter;
public class IMAManager implements Serializable {
private static final long serialVersionUID = -5556374398943757951L;
- private static final Log __log = LogFactory.getLog(IMAManager.class);
+ private static final Logger __log = LoggerFactory.getLogger(IMAManager.class);
// holds rid for registered IMAs
public final Map<RequestIdTuple, Entry> _byRid = new HashMap<RequestIdTuple, Entry>();
@@ -89,7 +89,7 @@ public class IMAManager implements Serializable {
if (_byChannel.containsKey(pickResponseChannel)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
@@ -98,7 +98,7 @@ public class IMAManager implements Serializable {
final RequestIdTuple rid = new RequestIdTuple(selectors[i].plinkInstance, selectors[i].opName);
if (_byRid.containsKey(rid)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RID " + rid;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalStateException(errmsg);
}
_byRid.put(rid, entry);
@@ -148,7 +148,7 @@ public class IMAManager implements Serializable {
while (_byRid.values().remove(entry));
} else if (!isTimer){
String errmsg = "INTERNAL ERROR: No ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java
index a629e8f..44d86f4 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager2.java
@@ -28,8 +28,8 @@ import java.util.Set;
import javax.wsdl.OperationType;
-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.runtime.PartnerLinkInstance;
import org.apache.ode.bpel.runtime.Selector;
@@ -44,7 +44,7 @@ import org.apache.ode.utils.ObjectPrinter;
public class IMAManager2 implements Serializable {
private static final long serialVersionUID = -5556374398943757951L;
- private static final Log __log = LogFactory.getLog(IMAManager2.class);
+ private static final Logger __log = LoggerFactory.getLogger(IMAManager2.class);
// holds rid for registered IMAs
public final Map<RequestIdTuple, Entry> _byRid = new HashMap<RequestIdTuple, Entry>();
@@ -89,7 +89,7 @@ public class IMAManager2 implements Serializable {
if (_byChannel.containsKey(pickResponseChannel)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
@@ -98,7 +98,7 @@ public class IMAManager2 implements Serializable {
final RequestIdTuple rid = new RequestIdTuple(selectors[i].plinkInstance, selectors[i].opName, selectors[i].correlationKeySet);
if (_byRid.containsKey(rid)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RID " + rid;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalStateException(errmsg);
}
_byRid.put(rid, entry);
@@ -148,7 +148,7 @@ public class IMAManager2 implements Serializable {
while (_byRid.values().remove(entry));
} else if (!isTimer){
String errmsg = "INTERNAL ERROR: No ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
index 1571eac..3075a81 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.engine;
-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.ClusterLock;
import java.util.HashMap;
@@ -38,7 +38,7 @@ import java.util.concurrent.locks.Lock;
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*/
public class InstanceLockManager implements ClusterLock<Long> {
- private static final Log __log = LogFactory.getLog(InstanceLockManager.class);
+ private static final Logger __log = LoggerFactory.getLogger(InstanceLockManager.class);
private final Lock _mutex = new java.util.concurrent.locks.ReentrantLock();
private final Map<Long, InstanceInfo> _locks = new HashMap<Long,InstanceInfo>();
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
index 010b3ac..820f4f1 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.engine;
-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.iapi.BpelEngineException;
@@ -37,7 +37,7 @@ import java.util.Set;
abstract class MessageExchangeImpl implements MessageExchange {
- private static final Log __log = LogFactory.getLog(MessageExchangeImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(MessageExchangeImpl.class);
protected static final Messages __msgs = MessageBundle.getMessages(Messages.class);
/** Process-Instance identifier.*/
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
index 232791f..a9320a3 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
@@ -31,8 +31,8 @@ import java.util.concurrent.TimeoutException;
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.MessageExchangeDAO;
import org.apache.ode.bpel.engine.replayer.Replayer;
import org.apache.ode.bpel.iapi.Message;
@@ -53,7 +53,7 @@ import org.w3c.dom.Node;
public class MyRoleMessageExchangeImpl extends MessageExchangeImpl implements MyRoleMessageExchange {
- private static final Log __log = LogFactory.getLog(MyRoleMessageExchangeImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(MyRoleMessageExchangeImpl.class);
protected BpelProcess _process;
@@ -113,7 +113,7 @@ public class MyRoleMessageExchangeImpl extends MessageExchangeImpl implements My
public Future invoke(Message request) {
if (request == null) {
String errmsg = "Must pass non-null message to invoke()!";
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new NullPointerException(errmsg);
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
index f7c7ac7..3a8293f 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.engine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
@@ -38,7 +38,7 @@ import java.util.concurrent.locks.ReentrantLock;
* @author Maciej Szefler ( m s z e f l e r @ g m a i l . c o m )
*/
public class NStateLatch {
- static final Log __log = LogFactory.getLog(NStateLatch.class);
+ static final Logger __log = LoggerFactory.getLogger(NStateLatch.class);
/** Current state. */
private int _state = -1;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
index 7746d2b..e6c0ce4 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
@@ -29,8 +29,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -48,7 +48,7 @@ import org.apache.commons.logging.LogFactory;
public class OutstandingRequestManager implements Serializable {
private static final long serialVersionUID = -5556374398943757951L;
- private static final Log __log = LogFactory.getLog(OutstandingRequestManager.class);
+ private static final Logger __log = LoggerFactory.getLogger(OutstandingRequestManager.class);
public final Map<RequestIdTuple, Entry> _byRid = new HashMap<RequestIdTuple, Entry>();
public final Map<String, Entry> _byChannel = new HashMap<String, Entry>();
@@ -88,7 +88,7 @@ public class OutstandingRequestManager implements Serializable {
if (_byChannel.containsKey(pickResponseChannel)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
@@ -101,7 +101,7 @@ public class OutstandingRequestManager implements Serializable {
final RequestIdTuple rid = new RequestIdTuple(selectors[i].plinkInstance,selectors[i].opName, selectors[i].messageExchangeId);
if (_byRid.containsKey(rid)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RID " + rid;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalStateException(errmsg);
}
_byRid.put(rid, entry);
@@ -143,7 +143,7 @@ public class OutstandingRequestManager implements Serializable {
Entry entry = _byChannel.get(pickResponseChannel);
if (entry == null) {
String errmsg = "INTERNAL ERROR: No ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
@@ -151,7 +151,7 @@ public class OutstandingRequestManager implements Serializable {
// Hence, the sanity check shown below is no longer valid
// if (entry.mexRef != null) {
// String errmsg = "INTERNAL ERROR: Duplicate ASSOCIATION for CHANEL " + pickResponseChannel;
-// __log.fatal(errmsg);
+// __log.error(errmsg);
// throw new IllegalStateException(errmsg);
// }
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
index ab05ce4..9146932 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
@@ -28,8 +28,8 @@ import javax.wsdl.Operation;
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.common.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
@@ -65,7 +65,7 @@ import org.w3c.dom.Node;
* @author Matthieu Riou <mriou at apache dot org>
*/
public class PartnerLinkMyRoleImpl extends PartnerLinkRoleImpl {
- private static final Log __log = LogFactory.getLog(BpelProcess.class);
+ private static final Logger __log = LoggerFactory.getLogger(BpelProcess.class);
private static final Messages __msgs = MessageBundle.getMessages(Messages.class);
/** The local endpoint for this "myrole". */
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java
index 0508457..76be5a1 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.engine;
-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.PartnerRoleChannel;
import org.apache.ode.bpel.obj.OPartnerLink;
@@ -28,7 +28,7 @@ import org.apache.ode.bpel.obj.OPartnerLink;
* @author Matthieu Riou <mriou at apache dot org>
*/
class PartnerLinkPartnerRoleImpl extends PartnerLinkRoleImpl {
- static final Log __log = LogFactory.getLog(BpelProcess.class);
+ static final Logger __log = LoggerFactory.getLogger(BpelProcess.class);
Endpoint _initialPartner;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java
index 6e7ed43..77a7795 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.engine;
-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.MessageExchangeDAO;
import org.apache.ode.bpel.engine.replayer.Replayer;
import org.apache.ode.bpel.iapi.BpelEngineException;
@@ -38,7 +38,7 @@ import javax.wsdl.PortType;
import javax.xml.namespace.QName;
public class PartnerRoleMessageExchangeImpl extends MessageExchangeImpl implements PartnerRoleMessageExchange {
- private static final Log LOG = LogFactory.getLog(PartnerRoleMessageExchangeImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PartnerRoleMessageExchangeImpl.class);
private PartnerRoleChannel _channel;
private EndpointReference _myRoleEPR;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
index dad6a64..e1a7bd9 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
@@ -41,8 +41,8 @@ import java.util.regex.Pattern;
import javax.xml.namespace.QName;
import org.apache.commons.collections.comparators.ComparatorChain;
-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;
@@ -158,7 +158,7 @@ public class ProcessAndInstanceManagementImpl implements InstanceManagement, Pro
protected static final Messages __msgs = MessageBundle.getMessages(Messages.class);
- protected static Log __log = LogFactory.getLog(BpelManagementFacadeImpl.class);
+ protected static Logger __log = LoggerFactory.getLogger(BpelManagementFacadeImpl.class);
protected static final ProcessStatusConverter __psc = new ProcessStatusConverter();
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
index 6790ec8..96c79d4 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
@@ -24,8 +24,8 @@ import java.util.concurrent.Callable;
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.DeferredProcessInstanceCleanable;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.engine.BpelServerImpl.ContextsAware;
@@ -35,7 +35,7 @@ import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable;
public class ProcessCleanUpRunnable implements MapSerializableRunnable, ContextsAware {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(ProcessCleanUpRunnable.class);
+ private static final Logger __log = LoggerFactory.getLogger(ProcessCleanUpRunnable.class);
public final static int PROCESS_CLEANUP_TRANSACTION_SIZE = Integer.getInteger("org.apache.ode.processInstanceDeletion.transactionSize", 10);
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java
index e8142b1..691591a 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java
@@ -31,8 +31,8 @@ import java.util.concurrent.ExecutorService;
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.engine.Contexts;
import org.apache.ode.bpel.engine.BpelServerImpl.ContextsAware;
import org.apache.ode.bpel.iapi.ClusterAware;
@@ -43,7 +43,7 @@ import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable;
import org.apache.ode.utils.CronExpression;
public class CronScheduler {
- static final Log __log = LogFactory.getLog(CronScheduler.class);
+ static final Logger __log = LoggerFactory.getLogger(CronScheduler.class);
// minimum interval of the cron job(1 second)
private final long MIN_INTERVAL = 0;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
index 098f8b4..6320b36 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
@@ -25,8 +25,8 @@ import java.util.concurrent.Callable;
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.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.FilteredInstanceDeletable;
@@ -38,7 +38,7 @@ import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable;
public class RuntimeDataCleanupRunnable implements MapSerializableRunnable, ContextsAware {
- private final Log __log = LogFactory.getLog(RuntimeDataCleanupRunnable.class);
+ private final Logger __log = LoggerFactory.getLogger(RuntimeDataCleanupRunnable.class);
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
index 3721cd6..dfaa932 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
@@ -25,8 +25,8 @@ import java.util.Arrays;
import java.util.HashMap;
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.schedules.SchedulesDocument;
import org.apache.ode.bpel.schedules.TSchedule;
import org.apache.ode.bpel.dd.TCleanup;
@@ -40,7 +40,7 @@ import org.apache.xmlbeans.XmlOptions;
public class SystemSchedulesConfig {
- private final static Log __log = LogFactory.getLog(SystemSchedulesConfig.class);
+ private final static Logger __log = LoggerFactory.getLogger(SystemSchedulesConfig.class);
public final static String SCHEDULE_CONFIG_FILE_PROP_KEY = "org.apache.ode.scheduleConfigFile";
private File schedulesFile;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java
index 25cb69c..8c576ac 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java
@@ -23,8 +23,8 @@ import java.util.Map;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ode.bpel.engine.BpelProcess;
import org.apache.ode.bpel.iapi.BpelEngineException;
import org.apache.ode.bpel.obj.OBase;
@@ -47,7 +47,7 @@ import org.w3c.dom.Node;
*/
public class ExternalVariableManager {
- private static final Log __log = LogFactory.getLog(ExternalVariableManager.class);
+ private static final Logger __log = LoggerFactory.getLogger(ExternalVariableManager.class);
/** Mapping of engine names to engine. */
private Map<QName, ExternalVariableModule> _engines;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
index d3ca07f..3887e31 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
@@ -27,8 +27,8 @@ import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.obj.*;
import org.apache.ode.bpel.runtime.Selector;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.namespace.QName;
import javax.wsdl.Operation;
@@ -43,7 +43,7 @@ import java.io.ByteArrayOutputStream;
* set id to one using its name. So something like 1~abc~de will become foo~abc~de.
*/
public class CorrelationKeyMigration implements Migration {
- private static final Log __log = LogFactory.getLog(CorrelationKeyMigration.class);
+ private static final Logger __log = LoggerFactory.getLogger(CorrelationKeyMigration.class);
public boolean migrate(Set<BpelProcess> registeredProcesses, BpelDAOConnection connection) {
// Map only used to avoid duplicates, set would force to re-implement equals
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java
index 33200e3..96cd72e 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java
@@ -27,8 +27,8 @@ import org.apache.ode.bpel.dao.MessageRouteDAO;
import org.apache.ode.bpel.obj.OPartnerLink;
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.wsdl.Operation;
import java.util.Set;
@@ -38,7 +38,7 @@ import java.util.Iterator;
* Changes the scheme of the correlation key value in the routes to use @2[...]
*/
public class CorrelationKeySetDataMigration implements Migration {
- private static final Log __log = LogFactory.getLog(CorrelationKeyMigration.class);
+ private static final Logger __log = LoggerFactory.getLogger(CorrelationKeyMigration.class);
public boolean migrate(Set<BpelProcess> registeredProcesses, BpelDAOConnection connection) {
for (BpelProcess process : registeredProcesses) {
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java
index 7374261..3e08590 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java
@@ -30,8 +30,8 @@ import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.obj.OProcess;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.namespace.QName;
import java.util.Set;
@@ -45,7 +45,7 @@ import java.io.ByteArrayOutputStream;
* Migrates the database from using single correlations to multiple correlations support.
*/
public class CorrelationKeySetMigration implements Migration {
- private static final Log __log = LogFactory.getLog(CorrelationKeySetMigration.class);
+ private static final Logger __log = LoggerFactory.getLogger(CorrelationKeySetMigration.class);
public boolean migrate(Set<BpelProcess> registeredProcesses, BpelDAOConnection connection) {
boolean v1First = true;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java
index 6a97632..6443aff 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java
@@ -24,8 +24,8 @@ import org.apache.ode.bpel.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.dao.CorrelatorDAO;
import org.apache.ode.bpel.obj.OPartnerLink;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.wsdl.Operation;
import java.util.Set;
@@ -36,7 +36,7 @@ import java.util.Iterator;
* partnerLinkId+"."+operationName to partnerLinkName+"."+operationName
*/
public class CorrelatorsMigration implements Migration {
- private static final Log __log = LogFactory.getLog(CorrelatorsMigration.class);
+ private static final Logger __log = LoggerFactory.getLogger(CorrelatorsMigration.class);
public boolean migrate(Set<BpelProcess> registeredProcesses, BpelDAOConnection connection) {
for (BpelProcess process : registeredProcesses) {
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/IMAManagerMigration.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/IMAManagerMigration.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/IMAManagerMigration.java
index c6f8f4e..5843184 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/IMAManagerMigration.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/IMAManagerMigration.java
@@ -24,8 +24,8 @@ import java.io.ByteArrayOutputStream;
import java.util.Collection;
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.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
@@ -39,7 +39,7 @@ import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
*
*/
public class IMAManagerMigration implements Migration {
- private static Log __log = LogFactory.getLog(IMAManagerMigration.class);
+ private static Logger __log = LoggerFactory.getLogger(IMAManagerMigration.class);
public boolean migrate(Set<BpelProcess> registeredProcesses, BpelDAOConnection connection) {
boolean migrationResult = true;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java
index 19071ba..07afa8d 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java
@@ -31,8 +31,8 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.Callable;
-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.engine.BpelProcess;
import org.apache.ode.bpel.engine.Contexts;
@@ -40,7 +40,7 @@ import org.apache.ode.bpel.engine.Contexts;
* Checks database schema versions and migrates when necessary.
*/
public class MigrationHandler {
- private static final Log __log = LogFactory.getLog(MigrationHandler.class);
+ private static final Logger __log = LoggerFactory.getLogger(MigrationHandler.class);
public static final int CURRENT_SCHEMA_VERSION = 7;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java
index 232add8..8883033 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java
@@ -25,8 +25,8 @@ import java.io.IOException;
import java.util.Collection;
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.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
@@ -40,7 +40,7 @@ import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
*
*/
public class OutstandingRequestsMigration implements Migration {
- private static Log __log = LogFactory.getLog(OutstandingRequestsMigration.class);
+ private static Logger __log = LoggerFactory.getLogger(OutstandingRequestsMigration.class);
public boolean migrate(Set<BpelProcess> registeredProcesses, BpelDAOConnection connection) {
boolean migrationResult = true;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
index 8ed99d4..424a1fd 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
@@ -28,8 +28,8 @@ import java.util.HashSet;
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.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.dao.ProcessDAO;
@@ -66,7 +66,7 @@ import org.apache.xmlbeans.XmlObject;
*
*/
public class Replayer {
- private static final Log __log = LogFactory.getLog(Replayer.class);
+ private static final Logger __log = LoggerFactory.getLogger(Replayer.class);
public static ThreadLocal<Replayer> replayer = new ThreadLocal<Replayer>();
public ReplayerScheduler scheduler = new ReplayerScheduler();
public BpelEngineImpl engine = null;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java
index 206695d..ef7487d 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java
@@ -24,8 +24,8 @@ import java.util.concurrent.Callable;
import javax.wsdl.Operation;
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.FaultException;
import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
@@ -70,7 +70,7 @@ import org.w3c.dom.NodeList;
*
*/
public class ReplayerBpelRuntimeContextImpl extends BpelRuntimeContextImpl {
- private static final Log __log = LogFactory.getLog(ReplayerBpelRuntimeContextImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(ReplayerBpelRuntimeContextImpl.class);
private ReplayerContext replayerContext;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
index 98c7aac..3447fa0 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
@@ -35,8 +35,8 @@ import javax.xml.xquery.XQResultSequence;
import net.sf.saxon.xqj.SaxonXQConnection;
import net.sf.saxon.xqj.SaxonXQDataSource;
-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.ProcessDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.BpelEngineImpl;
@@ -67,7 +67,7 @@ import org.w3c.dom.Node;
*
*/
public class ReplayerContext {
- private static final Log __log = LogFactory.getLog(ReplayerContext.class);
+ private static final Logger __log = LoggerFactory.getLogger(ReplayerContext.class);
public ReplayerScheduler scheduler;
@@ -182,7 +182,6 @@ public class ReplayerContext {
return answer;
} catch (Exception e) {
__log.error("", e);
- __log.error(e.getCause());
throw new IllegalStateException(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java
index 5340b41..b965bf9 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java
@@ -24,8 +24,8 @@ import java.util.PriorityQueue;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
-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.iapi.ContextException;
import org.apache.ode.bpel.iapi.Scheduler;
@@ -37,7 +37,7 @@ import org.apache.ode.bpel.iapi.Scheduler;
*
*/
public class ReplayerScheduler implements Scheduler {
- private static final Log __log = LogFactory.getLog(ReplayerScheduler.class);
+ private static final Logger __log = LoggerFactory.getLogger(ReplayerScheduler.class);
public Replayer replayer;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
index 8f14f87..cb9e769 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
@@ -30,8 +30,8 @@ import java.util.Set;
import javax.sql.DataSource;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.GUID;
import org.apache.ode.utils.ISO8601DateParser;
@@ -48,7 +48,7 @@ import org.w3c.dom.NodeList;
* @author Maciej Szefler <mszefler at gmail dot com>
*/
class DbExternalVariable {
- private static final Log __log = LogFactory.getLog(DbExternalVariable.class);
+ private static final Logger __log = LoggerFactory.getLogger(DbExternalVariable.class);
private static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
index bced44f..d77899f 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
@@ -35,8 +35,8 @@ import javax.sql.DataSource;
import javax.swing.text.StyleContext.SmallAttributeSet;
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.extvar.jdbc.DbExternalVariable.Column;
import org.apache.ode.bpel.extvar.jdbc.DbExternalVariable.RowKey;
import org.apache.ode.bpel.extvar.jdbc.DbExternalVariable.RowVal;
@@ -49,7 +49,7 @@ import org.w3c.dom.Element;
public class JdbcExternalVariableModule implements ExternalVariableModule {
- private static final Log __log = LogFactory.getLog(JdbcExternalVariableModule.class);
+ private static final Logger __log = LoggerFactory.getLogger(JdbcExternalVariableModule.class);
public static final String JDBC_NS = "http://ode.apache.org/externalVariables/jdbc";
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/RowSubset.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/RowSubset.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/RowSubset.java
index 81dba75..ca94764 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/RowSubset.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/RowSubset.java
@@ -26,12 +26,12 @@ import java.util.ArrayList;
import java.util.HashMap;
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.extvar.jdbc.DbExternalVariable.Column;;
class RowSubset extends ArrayList<Object> {
- private static final Log LOG = LogFactory.getLog(RowSubset.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RowSubset.class);
private static final long serialVersionUID = 1L;
@@ -109,4 +109,4 @@ class RowSubset extends ArrayList<Object> {
buf.append(")");
return buf.toString();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
index eeea97e..60e2328 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.memdao;
-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;
@@ -56,7 +56,7 @@ import java.util.concurrent.ConcurrentHashMap;
* A very simple, in-memory implementation of the {@link BpelDAOConnection} interface.
*/
class BpelDAOConnectionImpl implements BpelDAOConnection {
- private static final Log __log = LogFactory.getLog(BpelDAOConnectionImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(BpelDAOConnectionImpl.class);
private Scheduler _scheduler;
private Map<QName, ProcessDaoImpl> _store;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
index 42d38d3..c090b53 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.memdao;
-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.*;
@@ -33,7 +33,7 @@ import java.util.Collection;
* A very simple, in-memory implementation of the {@link CorrelatorDAO} interface.
*/
class CorrelatorDaoImpl extends DaoBaseImpl implements CorrelatorDAO {
- private static final Log __log = LogFactory.getLog(CorrelatorDaoImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(CorrelatorDaoImpl.class);
private String _correlatorId;
private List<MsgQueueEntry> _messages;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/DaoBaseImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/DaoBaseImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/DaoBaseImpl.java
index 01cf77e..60040a8 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/DaoBaseImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/DaoBaseImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.memdao;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Date;
@@ -28,7 +28,7 @@ import java.util.Date;
*/
class DaoBaseImpl {
@SuppressWarnings("unused")
- private static final Log __logger = LogFactory.getLog(DaoBaseImpl.class);
+ private static final Logger __logger = LoggerFactory.getLogger(DaoBaseImpl.class);
Date _createTime = new Date();
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
index 4132b40..df63400 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
@@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentLinkedQueue;
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.CorrelationSetDAO;
@@ -43,7 +43,7 @@ import org.apache.ode.bpel.dao.ProcessInstanceDAO;
* A very simple, in-memory implementation of the {@link ProcessDAO} interface.
*/
class ProcessDaoImpl extends DaoBaseImpl implements ProcessDAO {
- private static final Log __log = LogFactory.getLog(ProcessDaoImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(ProcessDaoImpl.class);
private QName _processId;
private QName _type;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITY.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITY.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITY.java
index 0982bef..3783bfa 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITY.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITY.java
@@ -22,8 +22,8 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
-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.ActivityEvent;
import org.apache.ode.bpel.evt.EventContext;
@@ -44,7 +44,7 @@ import org.w3c.dom.Node;
* Base template for activities.
*/
abstract class ACTIVITY extends BpelJacobRunnable implements IndexedObject {
- private static final Log __log = LogFactory.getLog(ACTIVITY.class);
+ private static final Logger __log = LoggerFactory.getLogger(ACTIVITY.class);
protected ActivityInfo _self;
/**
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
index dd2ee74..f1487f7 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
import java.util.Map;
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.evt.ActivityEnabledEvent;
import org.apache.ode.bpel.evt.ActivityExecEndEvent;
@@ -57,7 +57,7 @@ import static org.apache.ode.jacob.ProcessUtil.compose;
class ACTIVITYGUARD extends ACTIVITY {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(ACTIVITYGUARD.class);
+ private static final Logger __log = LoggerFactory.getLogger(ACTIVITYGUARD.class);
private static final ActivityTemplateFactory __activityTemplateFactory = new ActivityTemplateFactory();
private OActivity _oactivity;
@@ -221,7 +221,7 @@ class ACTIVITYGUARD extends ACTIVITY {
linfo.pub.linkStatus(val);
} catch (FaultException e) {
linfo.pub.linkStatus(false);
- __log.error(e);
+ __log.error("",e);
if (fault == null)
fault = createFault(e.getQName(),olink.getTransitionCondition());
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
index 9ed3e4c..0f442b9 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.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.PartnerLinkModificationEvent;
import org.apache.ode.bpel.evt.ScopeEvent;
@@ -68,7 +68,7 @@ import java.util.Map;
class ASSIGN extends ACTIVITY {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(ASSIGN.class);
+ private static final Logger __log = LoggerFactory.getLogger(ASSIGN.class);
private static final ASSIGNMessages __msgs = MessageBundle
.getMessages(ASSIGNMessages.class);
@@ -118,7 +118,7 @@ class ASSIGN extends ACTIVITY {
}
}
- protected Log log() {
+ protected Logger log() {
return __log;
}
@@ -387,8 +387,7 @@ class ASSIGN extends ACTIVITY {
((VariableModificationEvent)se).setNewValue(lvalue);
} else {
// This really should have been caught by the compiler.
- __log
- .fatal("Message/Non-Message Assignment, should be caught by compiler:"
+ __log.error("Message/Non-Message Assignment, should be caught by compiler:"
+ ocopy);
throw new FaultException(
ocopy.getOwner().getConstants().getQnSelectionFailure(),
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java
index bf58d75..d87b9b2 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelJacobRunnable.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.CorrelationKey;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.obj.OBase;
@@ -41,7 +41,7 @@ import javax.xml.namespace.QName;
* @author Maciej Szefler
*/
public abstract class BpelJacobRunnable extends JacobRunnable {
- private static final Log __log = LogFactory.getLog(BpelJacobRunnable.class);
+ private static final Logger __log = LoggerFactory.getLogger(BpelJacobRunnable.class);
protected BpelRuntimeContext getBpelRuntimeContext() {
BpelRuntimeContext nativeApi = (BpelRuntimeContext) JacobVPU.activeJacobThread().getExtension(BpelRuntimeContext.class);
@@ -49,7 +49,7 @@ public abstract class BpelJacobRunnable extends JacobRunnable {
return nativeApi;
}
- protected Log log() {
+ protected Logger log() {
return __log;
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
index 3c5ba32..4a5b161 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
@@ -22,8 +22,8 @@ import java.util.Calendar;
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.EvaluationContext;
import org.apache.ode.bpel.explang.EvaluationException;
@@ -50,7 +50,7 @@ import static org.apache.ode.jacob.ProcessUtil.compose;
*/
class EH_ALARM extends BpelJacobRunnable {
- private static final Log __log = LogFactory.getLog(EH_ALARM.class);
+ private static final Logger __log = LoggerFactory.getLogger(EH_ALARM.class);
private static final long serialVersionUID = 1L;
@@ -87,7 +87,7 @@ class EH_ALARM extends BpelJacobRunnable {
} catch (EvaluationException e) {
throw new InvalidProcessException(e);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
_psc.completed(createFault(e.getQName(),_oalarm.getForExpr()), _comps);
return;
}
@@ -97,7 +97,7 @@ class EH_ALARM extends BpelJacobRunnable {
} catch (EvaluationException e) {
throw new InvalidProcessException(e);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
_psc.completed(createFault(e.getQName(),_oalarm.getUntilExpr()), _comps);
return;
}
@@ -107,7 +107,7 @@ class EH_ALARM extends BpelJacobRunnable {
} catch (EvaluationException e) {
throw new InvalidProcessException(e);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
_psc.completed(createFault(e.getQName(),_oalarm.getRepeatExpr()), _comps);
return;
}
@@ -233,7 +233,7 @@ class EH_ALARM extends BpelJacobRunnable {
} catch (EvaluationException e) {
throw new InvalidProcessException(e);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
_psc.completed(createFault(e.getQName(),_oalarm.getForExpr()), _comps);
return;
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
index 093ab6f..430d942 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.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.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
@@ -49,7 +49,7 @@ class EH_EVENT extends BpelJacobRunnable {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(EH_EVENT.class);
+ private static final Logger __log = LoggerFactory.getLogger(EH_EVENT.class);
private EventHandlerControl _ehc;
private Termination _tc;
@@ -136,7 +136,7 @@ class EH_EVENT extends BpelJacobRunnable {
getBpelRuntimeContext().select(pickResponseChannel, null, false, new Selector[] { selector} );
instance(new WAITING(pickResponseChannel));
} catch(FaultException e){
- __log.error(e);
+ __log.error("",e);
if (_fault == null) {
_fault = createFault(e.getQName(), _oevent);
}
@@ -243,7 +243,7 @@ class EH_EVENT extends BpelJacobRunnable {
se.setLineNo(_oevent.getDebugInfo().getStartLine());
getBpelRuntimeContext().sendEvent(se);
} catch (Exception ex) {
- __log.fatal(ex);
+ __log.error("",ex);
throw new InvalidProcessException(ex);
}
}
@@ -281,7 +281,7 @@ class EH_EVENT extends BpelJacobRunnable {
_oevent.getOperation().getName(), _oevent.getMessageExchangeId(), mexId);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
if (_fault == null) {
_fault = createFault(e.getQName(), _oevent);
terminateActive();
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java
index def3c25..84de5cb 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.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;
/**
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
*/
class EMPTY extends ACTIVITY {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(EMPTY.class);
+ private static final Logger __log = LoggerFactory.getLogger(EMPTY.class);
public EMPTY(ActivityInfo self, ScopeFrame frame, LinkFrame linkFrame) {
super(self, frame, linkFrame);
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java
index 51f570b..3ffa761 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java
@@ -24,8 +24,8 @@ import java.util.Map;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.evt.ScopeEvent;
import org.apache.ode.bpel.evt.VariableReadEvent;
@@ -47,8 +47,7 @@ import org.w3c.dom.Node;
* variables, link statuses, and the like.
*/
public class ExprEvaluationContextImpl implements EvaluationContext {
- private static final Log __log = LogFactory
- .getLog(ExprEvaluationContextImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(ExprEvaluationContextImpl.class);
private BpelRuntimeContext _native;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
index 1d1ab61..0fe0232 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
@@ -23,8 +23,8 @@ import java.util.HashSet;
import java.util.Iterator;
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.evar.ExternalVariableModuleException;
import org.apache.ode.bpel.evt.VariableModificationEvent;
@@ -49,7 +49,7 @@ import org.w3c.dom.Node;
public class FOREACH extends ACTIVITY {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(FOREACH.class);
+ private static final Logger __log = LoggerFactory.getLogger(FOREACH.class);
private OForEach _oforEach;
private Set<ChildInfo> _children = new HashSet<ChildInfo>();
@@ -74,7 +74,7 @@ public class FOREACH extends ACTIVITY {
}
_currentCounter = _startCounter;
} catch (FaultException fe) {
- __log.error(fe);
+ __log.error("",fe);
_self.parent.completed(createFault(fe.getQName(), _self.o), _compHandlers);
return;
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
index c7398e3..78f3230 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
@@ -23,8 +23,8 @@ import java.util.Date;
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.FaultException;
import org.apache.ode.bpel.evar.ExternalVariableModuleException;
import org.apache.ode.bpel.evt.VariableModificationEvent;
@@ -46,7 +46,7 @@ import static org.apache.ode.jacob.ProcessUtil.compose;
*/
public class INVOKE extends ACTIVITY {
private static final long serialVersionUID = 992248281026821783L;
- private static final Log __log = LogFactory.getLog(INVOKE.class);
+ private static final Logger __log = LoggerFactory.getLogger(INVOKE.class);
private OInvoke _oinvoke;
// Records number of invocations on the activity.
@@ -69,12 +69,12 @@ public class INVOKE extends ACTIVITY {
try {
outboundMsg = setupOutbound(_oinvoke, _oinvoke.getInitCorrelationsInput(), _oinvoke.getJoinCorrelationsInput());
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
FaultData fault = createFault(e.getQName(), _oinvoke);
_self.parent.completed(fault, CompensationHandler.emptySet());
return;
} catch (ExternalVariableModuleException e) {
- __log.error(e);
+ __log.error("",e);
_self.parent.failure(e.toString(), null);
return;
}
@@ -202,7 +202,7 @@ public class INVOKE extends ACTIVITY {
})));
}
} catch (FaultException fault) {
- __log.error(fault);
+ __log.error("",fault);
FaultData faultData = createFault(fault.getQName(), _oinvoke, fault.getMessage());
_self.parent.completed(faultData, CompensationHandler.emptySet());
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
index 79cb1dc..1e1fd70 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
@@ -20,8 +20,8 @@ package org.apache.ode.bpel.runtime;
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.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
@@ -32,7 +32,7 @@ import org.apache.ode.jacob.Synch;
class ORDEREDCOMPENSATOR extends BpelJacobRunnable {
private static final long serialVersionUID = -3181661355085428370L;
- private static final Log __log = LogFactory.getLog(ORDEREDCOMPENSATOR.class);
+ private static final Logger __log = LoggerFactory.getLogger(ORDEREDCOMPENSATOR.class);
private List<CompensationHandler> _compensations;
private Synch _ret;
@@ -59,7 +59,7 @@ class ORDEREDCOMPENSATOR extends BpelJacobRunnable {
}
}
- protected Log log() {
+ protected Logger log() {
return __log;
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
index 90a777a..9525b15 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
@@ -26,8 +26,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.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
@@ -59,7 +59,7 @@ import static org.apache.ode.jacob.ProcessUtil.compose;
class PICK extends ACTIVITY {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(PICK.class);
+ private static final Logger __log = LoggerFactory.getLogger(PICK.class);
private OPickReceive _opick;
@@ -113,7 +113,7 @@ class PICK extends ACTIVITY {
}
getBpelRuntimeContext().select(pickResponseChannel, timeout, _opick.isCreateInstanceFlag(), selectors);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
FaultData fault = createFault(e.getQName(), _opick, e.getMessage());
dpe(_opick.getOutgoingLinks());
_self.parent.completed(fault, CompensationHandler.emptySet());
@@ -212,7 +212,7 @@ class PICK extends ACTIVITY {
// to the correct format; but you know what they say, don't trust anyone.
if (!(onMessage.getVariable().getType() instanceof OMessageVarType)) {
String errmsg = "Non-message variable for receive: should have been picked up by static analysis.";
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new InvalidProcessException(errmsg);
}
@@ -225,12 +225,12 @@ class PICK extends ACTIVITY {
Part part = vartype.getParts().get(pName);
if (part == null) {
String errmsg = "Inconsistent WSDL, part " + pName + " not found in message type " + vartype.getMessageType();
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new InvalidProcessException(errmsg);
}
if (msgPart == null) {
String errmsg = "Message missing part: " + pName;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new InvalidContextException(errmsg);
}
@@ -239,7 +239,7 @@ class PICK extends ACTIVITY {
Element e = DOMUtils.getFirstChildElement(msgPart);
if (e == null) {
String errmsg = "Message (element) part " + pName + " did not contain child element.";
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new InvalidContextException(errmsg);
}
@@ -247,7 +247,7 @@ class PICK extends ACTIVITY {
if(!qn.equals(ptype.getElementType())) {
String errmsg = "Message (element) part " + pName + " did not contain correct child element: expected "
+ ptype.getElementType() + " but got " + qn;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new InvalidContextException(errmsg);
}
}
@@ -342,7 +342,7 @@ class PICK extends ACTIVITY {
onMessage.getOperation().getName(), onMessage.getMessageExchangeId(), mexId);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
fault = createFault(e.getQName(), onMessage);
_self.parent.completed(fault, CompensationHandler.emptySet());
dpe(onMessage.getActivity());
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PropertyAliasEvaluationContext.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PropertyAliasEvaluationContext.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PropertyAliasEvaluationContext.java
index c40b07b..a665dc8 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PropertyAliasEvaluationContext.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PropertyAliasEvaluationContext.java
@@ -23,8 +23,8 @@ import java.util.Calendar;
import java.util.Date;
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.FaultException;
import org.apache.ode.bpel.engine.BpelRuntimeContextImpl;
import org.apache.ode.bpel.explang.EvaluationContext;
@@ -45,7 +45,7 @@ import javax.xml.namespace.QName;
* Expression language evaluation context used for evaluating property aliases.
*/
public class PropertyAliasEvaluationContext implements EvaluationContext {
- private static final Log __log = LogFactory.getLog(PropertyAliasEvaluationContext.class);
+ private static final Logger __log = LoggerFactory.getLogger(PropertyAliasEvaluationContext.class);
private Node _root;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java
index 38b9366..7e820da 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.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.ORepeatUntil;
@@ -40,7 +40,7 @@ import static org.apache.ode.jacob.ProcessUtil.compose;
public class REPEATUNTIL 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>();
@@ -63,7 +63,7 @@ public class REPEATUNTIL extends ACTIVITY {
return "<T:Act:RepeatUntil:" + _self.o + ">";
}
- protected Log log() {
+ protected Logger log() {
return __log;
}
@@ -124,7 +124,7 @@ public class REPEATUNTIL extends ACTIVITY {
try {
condResult = checkCondition();
} catch (FaultException fe) {
- __log.error(fe);
+ __log.error("",fe);
_self.parent.completed(createFault(fe.getQName(), _self.o),_compHandlers);
return;
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
index abe0fc1..d23c4f8 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
@@ -25,14 +25,14 @@ import org.apache.ode.bpel.runtime.channels.FaultData;
import java.util.Iterator;
-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;
class REPLY extends ACTIVITY {
private static final long serialVersionUID = 3040651951885161304L;
- private static final Log __log = LogFactory.getLog(REPLY.class);
+ private static final Logger __log = LoggerFactory.getLogger(REPLY.class);
REPLY(ActivityInfo self, ScopeFrame scopeFrame, LinkFrame linkFrame) {
super(self, scopeFrame, linkFrame);
@@ -70,7 +70,7 @@ class REPLY extends ACTIVITY {
oreply.getMessageExchangeId(), (Element)msg,
(oreply.getFault() != null) ? oreply.getFault() : null);
} catch (FaultException e) {
- __log.error(e);
+ __log.error("",e);
fault = createFault(e.getQName(), oreply);
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java
index f94c39a..075dbe2 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.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.runtime.channels.FaultData;
@@ -28,7 +28,7 @@ import org.apache.ode.bpel.runtime.channels.FaultData;
*/
class RETHROW extends ACTIVITY {
private static final long serialVersionUID = -6433171659586530126L;
- private static final Log __log = LogFactory.getLog(RETHROW.class);
+ private static final Logger __log = LoggerFactory.getLogger(RETHROW.class);
RETHROW(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/SCOPE.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
index 4a0a7b0..3e751ff 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.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.evt.ScopeCompletionEvent;
import org.apache.ode.bpel.evt.ScopeFaultEvent;
import org.apache.ode.bpel.evt.ScopeStartEvent;
@@ -62,7 +62,7 @@ import org.w3c.dom.Element;
class SCOPE extends ACTIVITY {
private static final long serialVersionUID = 6111903798996023525L;
- private static final Log __log = LogFactory.getLog(SCOPE.class);
+ private static final Logger __log = LoggerFactory.getLogger(SCOPE.class);
private OScope _oscope;
private ActivityInfo _child;
@@ -362,7 +362,7 @@ class SCOPE extends ACTIVITY {
se.setLineNo(_oscope.getDebugInfo().getStartLine());
sendEvent(se);
} catch (Exception ex) {
- __log.fatal(ex);
+ __log.error("",ex);
throw new InvalidProcessException(ex);
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
index f203e83..4f5c86c 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Map;
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.obj.OLink;
import org.apache.ode.bpel.obj.OScope;
import org.apache.ode.bpel.obj.OScope.Variable;
@@ -47,7 +47,7 @@ import org.w3c.dom.Element;
* A scope activity. The scope activity creates a new scope frame and proceeeds using the {@link SCOPE} template.
*/
public class SCOPEACT extends ACTIVITY {
- private static final Log __log = LogFactory.getLog(SCOPEACT.class);
+ private static final Logger __log = LoggerFactory.getLogger(SCOPEACT.class);
private static final long serialVersionUID = -4593029783757994939L;
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java
index 1f291c2..b3b93be 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java
@@ -26,8 +26,8 @@ import org.apache.ode.bpel.runtime.channels.FaultData;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
*/
class SWITCH extends ACTIVITY {
private static final long serialVersionUID = 1L;
- private static final Log __log = LogFactory.getLog(SWITCH.class);
+ private static final Logger __log = LoggerFactory.getLogger(SWITCH.class);
public SWITCH(ActivityInfo self, ScopeFrame scopeFrame, LinkFrame linkFrame) {
super(self, scopeFrame, linkFrame);
@@ -87,4 +87,4 @@ class SWITCH extends ACTIVITY {
instance(createChild(child,_scopeFrame,_linkFrame));
}
}
-}
\ No newline at end of file
+}