http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 97857dc..88bc962 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.o.OPartnerLink; @@ -28,7 +28,7 @@ import org.apache.ode.bpel.o.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/5e73553c/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 14afc26..6c7b866 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/5e73553c/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 d58bef1..e02d381 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 @@ -40,8 +40,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; @@ -157,7 +157,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/5e73553c/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 56c846a..3729c03 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/5e73553c/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 ee3fd2c..f60d952 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/5e73553c/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 1813c37..9669719 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/5e73553c/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 f77c86e..a8ca26e 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.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.schedules.SchedulesDocument; import org.apache.ode.bpel.schedules.TSchedule; import org.apache.ode.bpel.dd.TCleanup; @@ -39,7 +39,7 @@ import org.apache.ode.utils.CronExpression; 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/5e73553c/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 926f9a3..059c03a 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.o.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/5e73553c/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 e54ca10..c5d9646 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.o.*; 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/5e73553c/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 8f9174c..db9c60c 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.o.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/5e73553c/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 2d720bc..df31ee7 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.o.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/5e73553c/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 02fefda..5c66508 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.o.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/5e73553c/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 9ee9090..fa77b63 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 = 6; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 5681f56..e68fff6 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/5e73553c/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 75b6ad9..bfb4efa 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 @@ -30,8 +30,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.BpelDAOConnection; import org.apache.ode.bpel.dao.MessageExchangeDAO; import org.apache.ode.bpel.dao.ProcessDAO; @@ -68,7 +68,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/5e73553c/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 4f0158f..876d859 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; @@ -69,7 +69,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/5e73553c/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 53f9fd6..e9fc5d9 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/5e73553c/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 b09b44a..0caf5cc 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/5e73553c/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 c339273..82f9468 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/5e73553c/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 c1953f1..dfc97b8 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/5e73553c/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 fde320a..fb67e30 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/5e73553c/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 d2ecbb2..29d355a 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/5e73553c/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 6499d07..5de76f2 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/5e73553c/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/5e73553c/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 bc35c38..3e1ebd7 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/5e73553c/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 862c759..8193607 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/5e73553c/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 5d720b8..5196b37 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 @@ -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.ActivityEnabledEvent; import org.apache.ode.bpel.evt.ActivityExecEndEvent; @@ -57,7 +57,7 @@ import java.util.Set; 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; @@ -222,7 +222,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.transitionCondition); } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 a2f153c..b383125 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().constants.qnSelectionFailure, @@ -647,7 +646,7 @@ class ASSIGN extends ACTIVITY { data = ec.evaluateQuery(data, expression); } catch (EvaluationException e) { String msg = __msgs.msgEvalException(expression.toString(), e.getMessage()); - if (__log.isDebugEnabled()) __log.debug(expression + ": " + msg); + if (__log.isDebugEnabled()) __log.debug("",expression + ": " + msg); if (e.getCause() instanceof FaultException) throw (FaultException)e.getCause(); throw new FaultException(getOAsssign().getOwner().constants.qnSubLanguageExecutionFault, msg); } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 d06accd..420871a 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.o.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/5e73553c/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 edbf9ce..1e559c2 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 @@ -34,8 +34,8 @@ import org.apache.ode.bpel.runtime.channels.TimerResponseChannel; import org.apache.ode.bpel.runtime.channels.TimerResponseChannelListener; import org.apache.ode.jacob.ChannelListener; import org.apache.ode.jacob.SynchChannel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Calendar; import java.util.HashSet; @@ -52,7 +52,7 @@ import org.w3c.dom.Element; */ 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; @@ -89,7 +89,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.forExpr), _comps); return; } @@ -99,7 +99,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.untilExpr), _comps); return; } @@ -109,7 +109,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.repeatExpr), _comps); return; } @@ -237,7 +237,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.forExpr), _comps); return; } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 785207b..2da6fae 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; @@ -50,7 +50,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 EventHandlerControlChannel _ehc; private TerminationChannel _tc; @@ -137,7 +137,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); } @@ -249,7 +249,7 @@ class EH_EVENT extends BpelJacobRunnable { se.setLineNo(_oevent.debugInfo.startLine); getBpelRuntimeContext().sendEvent(se); } catch (Exception ex) { - __log.fatal(ex); + __log.error("",ex); throw new InvalidProcessException(ex); } } @@ -287,7 +287,7 @@ class EH_EVENT extends BpelJacobRunnable { _oevent.operation.getName(), _oevent.messageExchangeId, 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/5e73553c/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 21e8d3a..6e50b8b 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/5e73553c/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 46eb021..12b66c3 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/5e73553c/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 28a6675..1062569 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.evt.VariableModificationEvent; import org.apache.ode.bpel.explang.EvaluationException; @@ -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/5e73553c/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 b06e8ae..9ddc560 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.evt.ActivityFailureEvent; import org.apache.ode.bpel.evt.ActivityRecoveryEvent; @@ -48,7 +48,7 @@ import org.w3c.dom.Node; */ 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. @@ -71,12 +71,12 @@ public class INVOKE extends ACTIVITY { try { outboundMsg = setupOutbound(_oinvoke, _oinvoke.initCorrelationsInput, _oinvoke.joinCorrelationsInput); } 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; } @@ -205,7 +205,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/5e73553c/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 8f1b190..e1340fa 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 @@ -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.jacob.SynchChannel; import org.apache.ode.jacob.SynchChannelListener; @@ -31,7 +31,7 @@ import java.util.List; 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 SynchChannel _ret; @@ -60,7 +60,7 @@ class ORDEREDCOMPENSATOR extends BpelJacobRunnable { } - protected Log log() { + protected Logger log() { return __log; } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 6ea0f9c..3112143 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; @@ -55,7 +55,7 @@ import org.w3c.dom.Node; 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; @@ -109,7 +109,7 @@ class PICK extends ACTIVITY { } getBpelRuntimeContext().select(pickResponseChannel, timeout, _opick.createInstanceFlag, selectors); } catch (FaultException e) { - __log.error(e); + __log.error("",e); FaultData fault = createFault(e.getQName(), _opick, e.getMessage()); dpe(_opick.outgoingLinks); _self.parent.completed(fault, CompensationHandler.emptySet()); @@ -208,7 +208,7 @@ class PICK extends ACTIVITY { // to the correct format; but you know what they say, don't trust anyone. if (!(onMessage.variable.type 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); } @@ -221,12 +221,12 @@ class PICK extends ACTIVITY { Part part = vartype.parts.get(pName); if (part == null) { String errmsg = "Inconsistent WSDL, part " + pName + " not found in message type " + vartype.messageType; - __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); } @@ -235,7 +235,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); } @@ -243,7 +243,7 @@ class PICK extends ACTIVITY { if(!qn.equals(ptype.elementType)) { String errmsg = "Message (element) part " + pName + " did not contain correct child element: expected " + ptype.elementType + " but got " + qn; - __log.fatal(errmsg); + __log.error(errmsg); throw new InvalidContextException(errmsg); } } @@ -338,7 +338,7 @@ class PICK extends ACTIVITY { onMessage.operation.getName(), onMessage.messageExchangeId, mexId); } catch (FaultException e) { - __log.error(e); + __log.error("",e); fault = createFault(e.getQName(), onMessage); _self.parent.completed(fault, CompensationHandler.emptySet()); dpe(onMessage.activity); http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 de04ddc..9afbd6e 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.o.ORepeatUntil; @@ -38,7 +38,7 @@ import org.w3c.dom.Element; 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>(); @@ -61,7 +61,7 @@ public class REPEATUNTIL extends ACTIVITY { return "<T:Act:RepeatUntil:" + _self.o + ">"; } - protected Log log() { + protected Logger log() { return __log; } @@ -122,7 +122,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/5e73553c/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 5879844..bd63efa 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.messageExchangeId, (Element)msg, (oreply.fault != null) ? oreply.fault : 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/5e73553c/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 b920f55..f294a50 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/5e73553c/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 e83dd73..72feb8c 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; @@ -61,7 +61,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.debugInfo.startLine); 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/5e73553c/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 09f6766..5fb20b6 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); @@ -60,7 +60,7 @@ class SWITCH extends ACTIVITY { throw new FaultException(oswitch.getOwner().constants.qnSubLanguageExecutionFault, e.getMessage()); } }catch(FaultException e){ - __log.error(e.getMessage(),e); + __log.error("",e.getMessage(),e); faultData = createFault(e.getQName(), ocase); _self.parent.completed(faultData, CompensationHandler.emptySet()); @@ -87,4 +87,4 @@ class SWITCH extends ACTIVITY { instance(createChild(child,_scopeFrame,_linkFrame)); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 245e4a8..0502105 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/5e73553c/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 763ba68..020a214 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.o.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.faultName, (Element)faultVariable,_othrow.faultVariable.type,_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/5e73553c/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 94d3312..ca78090 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 @@ -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.explang.EvaluationContext; import org.apache.ode.bpel.explang.EvaluationException; @@ -38,7 +38,7 @@ import java.util.Date; */ 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/5e73553c/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 be222c6..2f90409 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.o.OScope; @@ -41,7 +41,7 @@ import org.w3c.dom.Element; 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>(); @@ -56,7 +56,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; } @@ -79,7 +79,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/5e73553c/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 9c909bd..774684e 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.toString()); 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.toString()); assertTrue(o.toString().equals("")); } http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java b/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java index dfa5407..58b5b7c 100644 --- a/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java +++ b/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java @@ -26,9 +26,6 @@ import javax.xml.namespace.QName; import junit.framework.TestCase; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; import org.apache.ode.bpel.engine.Contexts; import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY; import org.apache.ode.bpel.iapi.ProcessConf.CleanupInfo; http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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..21313ee --- /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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-store/src/main/java/org/apache/ode/store/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 cef3bbd..bd3a58b 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; @@ -68,7 +68,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/5e73553c/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 b749f09..e849263 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/5e73553c/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 4559e82..5135bfd 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 @@ -23,15 +23,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/5e73553c/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 7f80a68..668547a 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; @@ -477,7 +477,7 @@ public class ProcessConfImpl implements ProcessConf { if(it.hasNext()) msg.append(", "); } msg.append("}"); - __log.debug(msg); + __log.debug(msg.toString()); } return prop; } @@ -561,4 +561,4 @@ public class ProcessConfImpl implements ProcessConf { return jobs; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-store/src/main/java/org/apache/ode/store/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 302c61c..5b49655 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; @@ -66,7 +66,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/5e73553c/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 134d6d3..c823953 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>();
