ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sath...@apache.org
Subject [4/5] ode git commit: ODE-983: Migrated to SLF4J and Log4j2
Date Thu, 26 Nov 2015 09:25:11 GMT
http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/main/java/org/apache/ode/axis2/util/UrlReplacementTransformer.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/UrlReplacementTransformer.java b/axis2/src/main/java/org/apache/ode/axis2/util/UrlReplacementTransformer.java
index c45ac2f..3408a3f 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/UrlReplacementTransformer.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/UrlReplacementTransformer.java
@@ -21,8 +21,8 @@ package org.apache.ode.axis2.util;
 
 import org.apache.commons.httpclient.util.URIUtil;
 import org.apache.commons.httpclient.URIException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.utils.DOMUtils;
 import org.w3c.dom.Element;
 
@@ -45,7 +45,7 @@ import java.util.Map;
  */
 public class UrlReplacementTransformer {
 
-    private static final Log log = LogFactory.getLog(UrlReplacementTransformer.class);
+    private static final Logger log = LoggerFactory.getLogger(UrlReplacementTransformer.class);
 
     private static final org.apache.ode.axis2.httpbinding.Messages httpMsgs = org.apache.ode.axis2.httpbinding.Messages.getMessages(org.apache.ode.axis2.httpbinding.Messages.class);
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingValidatorTest.java
----------------------------------------------------------------------
diff --git a/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingValidatorTest.java b/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingValidatorTest.java
index 9a777f8..5efb944 100644
--- a/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingValidatorTest.java
+++ b/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingValidatorTest.java
@@ -32,8 +32,8 @@ import java.util.Map;
 
 import org.apache.ode.utils.DOMUtils;
 import org.apache.ode.axis2.httpbinding.HttpBindingValidator;
-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;
 
 /**
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
  */
 public class HttpBindingValidatorTest extends TestCase {
 
-    private static final Log log = LogFactory.getLog(HttpBindingValidatorTest.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpBindingValidatorTest.class);
 
     private String[] resources = new String[]{"/http-binding-validator.wsdl", "/http-binding-validator-ext.wsdl"};
     private Definition[] definitions;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-api/src/main/java/org/apache/ode/bpel/common/InstanceFilter.java
----------------------------------------------------------------------
diff --git a/bpel-api/src/main/java/org/apache/ode/bpel/common/InstanceFilter.java b/bpel-api/src/main/java/org/apache/ode/bpel/common/InstanceFilter.java
index 04161f3..d74e78a 100644
--- a/bpel-api/src/main/java/org/apache/ode/bpel/common/InstanceFilter.java
+++ b/bpel-api/src/main/java/org/apache/ode/bpel/common/InstanceFilter.java
@@ -18,8 +18,8 @@
  */
 package org.apache.ode.bpel.common;
 
-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.pmapi.InvalidRequestException;
 import org.apache.ode.utils.ISO8601DateParser;
 import org.apache.ode.utils.RelativeDateParser;
@@ -40,7 +40,7 @@ import java.util.StringTokenizer;
  * language.
  */
 public class InstanceFilter extends Filter<InstanceFilter.Criteria> implements Serializable {
-    protected static Log LOG = LogFactory.getLog(InstanceFilter.class);
+    protected static Logger LOG = LoggerFactory.getLogger(InstanceFilter.class);
 
     private static final long serialVersionUID = 9999;
 
@@ -382,4 +382,4 @@ public class InstanceFilter extends Filter<InstanceFilter.Criteria> implements S
         }
         return list;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
index 983b368..a2b5f25 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
@@ -18,8 +18,8 @@
  */
 package org.apache.ode.bpel.compiler;
 
-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.bom.Activity;
 import org.apache.ode.bpel.compiler.bom.AssignActivity;
@@ -50,7 +50,7 @@ import javax.xml.namespace.QName;
  * @author Maciej Szefler ( m s z e f l e r @ g m a i l . c o m )
  */
 class AssignGenerator extends DefaultActivityGenerator {
-    private static final Log __log = LogFactory.getLog(AssignGenerator.class);
+    private static final Logger __log = LoggerFactory.getLogger(AssignGenerator.class);
 
     private static final AssignGeneratorMessages __cmsgs =
         MessageBundle.getMessages(AssignGeneratorMessages.class);

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
index e959d9b..ff1bd34 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
@@ -30,8 +30,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.compiler.api.CompilationException;
 import org.apache.ode.bpel.compiler.api.CompilationMessage;
 import org.apache.ode.bpel.compiler.api.CompileListener;
@@ -56,7 +56,7 @@ import org.xml.sax.InputSource;
  * </p>
 s */
 public class BpelC {
-    private static final Log __log = LogFactory.getLog(BpelC.class);
+    private static final Logger __log = LoggerFactory.getLogger(BpelC.class);
     private static final CommonCompilationMessages __cmsgs =
             MessageBundle.getMessages(CommonCompilationMessages.class);
 
@@ -500,7 +500,7 @@ public class BpelC {
 
 
     /**
-     * Log a compilation message, both to the log, and to the listener (if any).
+     * Logger a compilation message, both to the log, and to the listener (if any).
      * @param cmsg
      */
     private void logCompilationMessage(CompilationMessage cmsg) {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
index f24bf2f..00d8ccd 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
@@ -44,8 +44,8 @@ import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.compiler.api.CompilationException;
 import org.apache.ode.bpel.compiler.api.CompilationMessage;
 import org.apache.ode.bpel.compiler.api.CompileListener;
@@ -129,7 +129,7 @@ import org.w3c.dom.Node;
  */
 public abstract class BpelCompiler implements CompilerContext {
     /** Class-severity logger. */
-    protected static final Log __log = LogFactory.getLog(BpelCompiler.class);
+    protected static final Logger __log = LoggerFactory.getLogger(BpelCompiler.class);
 
     /** Standardized compiler messages. */
     private static final CommonCompilationMessages __cmsgs = MessageBundle.getMessages(CommonCompilationMessages.class);

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
index 861591f..7ffcb91 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
@@ -25,8 +25,8 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Basic implementation of the {@link ResourceFinder} interface. Resolves
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
  *
  */
 public class DefaultResourceFinder implements ResourceFinder {
-    private static final Log __log = LogFactory.getLog(DefaultResourceFinder.class);
+    private static final Logger __log = LoggerFactory.getLogger(DefaultResourceFinder.class);
 
     private File _relativeDir;
     private File _absoluteDir;
@@ -113,7 +113,7 @@ public class DefaultResourceFinder implements ResourceFinder {
         // return the absolute URI.
         URI relative = _relativeDir.toURI().relativize(uri);
         if (relative.isAbsolute() && !(relative.getScheme().equals("urn"))) {
-           __log.fatal("openResource: invalid scheme (should be urn:)  " + uri);
+           __log.error("openResource: invalid scheme (should be urn:)  " + uri);
            return null;
         }
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExpressionValidatorFactory.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExpressionValidatorFactory.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExpressionValidatorFactory.java
index 3e27ce3..00fc28f 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExpressionValidatorFactory.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExpressionValidatorFactory.java
@@ -20,8 +20,8 @@ package org.apache.ode.bpel.compiler;
 
 import java.util.Properties;
 
-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.api.CompilerContext;
 import org.apache.ode.bpel.compiler.api.ExpressionValidator;
@@ -30,7 +30,7 @@ import org.apache.ode.bpel.compiler.bom.Expression;
 import org.apache.ode.bpel.obj.OVarType;
 
 public class ExpressionValidatorFactory {
-    private static final Log __log = LogFactory.getLog(ExpressionValidatorFactory.class);
+    private static final Logger __log = LoggerFactory.getLogger(ExpressionValidatorFactory.class);
     private ExpressionValidator _validator = new EmptyValidator();
 
     public ExpressionValidatorFactory(Properties config) {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
index d0a4f8a..4f558f0 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
@@ -22,8 +22,8 @@ package org.apache.ode.bpel.compiler;
 import javax.xml.XMLConstants;
 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.bom.Activity;
 import org.apache.ode.bpel.compiler.bom.ForEachActivity;
@@ -40,7 +40,7 @@ import org.apache.ode.utils.Namespaces;
  */
 public class ForEachGenerator extends DefaultActivityGenerator {
 
-    private static final Log __log = LogFactory.getLog(AssignGenerator.class);
+    private static final Logger __log = LoggerFactory.getLogger(AssignGenerator.class);
     private static final ForEachGeneratorMessages __cmsgs = MessageBundle.getMessages(ForEachGeneratorMessages.class);
 
     public OActivity newInstance(Activity src) {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/LocalEntityResolver.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/LocalEntityResolver.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/LocalEntityResolver.java
index ca1e6e3..a8c4a4f 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/LocalEntityResolver.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/LocalEntityResolver.java
@@ -23,8 +23,8 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -33,7 +33,7 @@ import org.xml.sax.SAXException;
  * Resolver implementation that restricts us to a known set of resources.
  */
 class LocalEntityResolver implements EntityResolver {
-  private static final Log __log = LogFactory.getLog(LocalEntityResolver.class);
+  private static final Logger __log = LoggerFactory.getLogger(LocalEntityResolver.class);
 
   private final HashMap<String, URL> _mappings = new HashMap<String,URL>();
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
index 766b9e3..366669b 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
@@ -18,8 +18,8 @@
  */
 package org.apache.ode.bpel.compiler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
 import javax.wsdl.xml.WSDLLocator;
@@ -30,7 +30,7 @@ import java.net.URISyntaxException;
 
 public class WSDLLocatorImpl implements WSDLLocator {
 
-    private static final Log __log = LogFactory.getLog(WSDLLocatorImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(WSDLLocatorImpl.class);
 
     private ResourceFinder _resourceFinder;
     private URI _base;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
index e49e0ca..9fd8a2e 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
@@ -40,8 +40,8 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.compiler.api.CompilationException;
 import org.apache.ode.bpel.compiler.api.CompilerContext;
 import org.apache.ode.bpel.compiler.bom.PartnerLinkType;
@@ -64,7 +64,7 @@ import org.xml.sax.InputSource;
  * A parsed collection of WSDL definitions, including BPEL-specific extensions.
  */
 class WSDLRegistry {
-    private static final Log __log = LogFactory.getLog(WSDLRegistry.class);
+    private static final Logger __log = LoggerFactory.getLogger(WSDLRegistry.class);
 
     private static final CommonCompilationMessages __cmsgs =
             MessageBundle.getMessages(CommonCompilationMessages.class);

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
index b02de5f..e27d44b 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
@@ -26,8 +26,8 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 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.xerces.xni.XMLResourceIdentifier;
 import org.apache.xerces.xni.XNIException;
 import org.apache.xerces.xni.parser.XMLEntityResolver;
@@ -43,8 +43,7 @@ import org.apache.xerces.xni.parser.XMLInputSource;
  */
 public class WsdlFinderXMLEntityResolver implements XMLEntityResolver {
 
-    private static final Log __log = LogFactory
-            .getLog(WsdlFinderXMLEntityResolver.class);
+    private static final Logger __log = LoggerFactory.getLogger(WsdlFinderXMLEntityResolver.class);
 
     /**
      * Flag indicating whether the resolver should fail with an exception if the

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
index 02cde22..7ab2acb 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
@@ -18,8 +18,8 @@
  */
 package org.apache.ode.bpel.compiler.bom;
 
-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.bom.IfActivity.Case;
 import org.apache.ode.utils.DOMUtils;
@@ -43,7 +43,7 @@ import java.util.Map;
 
 public class BpelObjectFactory {
 
-    private static final Log __log = LogFactory.getLog(BpelObjectFactory.class);
+    private static final Logger __log = LoggerFactory.getLogger(BpelObjectFactory.class);
     private static BpelObjectFactory __instance = new BpelObjectFactory();
 
     public static final String WSDL = "http://schemas.xmlsoap.org/wsdl/";
@@ -290,7 +290,7 @@ public class BpelObjectFactory {
     }
 
     public static class BOMSAXErrorHandler implements ErrorHandler {
-        private static final Log __log = LogFactory.getLog(BOMSAXErrorHandler.class);
+        private static final Logger __log = LoggerFactory.getLogger(BOMSAXErrorHandler.class);
         
     	private boolean ok = true;
     	private boolean strict = false;
@@ -316,7 +316,7 @@ public class BpelObjectFactory {
 		public void fatalError(SAXParseException exception) throws SAXException {
 			ok = false;
 			if (strict) {
-			    __log.fatal(formatException(exception));    
+			    __log.error(formatException(exception));    
 			} else {
 			    __log.warn(formatException(exception));
 			}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java
index 149dbb4..f14a807 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.bpel.compiler.bom;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -33,7 +33,7 @@ import java.util.HashMap;
  * Resolver implementation that restricts us to a known set of resources.
  */
 class LocalEntityResolver implements EntityResolver {
-  private static final Log __log = LogFactory.getLog(LocalEntityResolver.class);
+  private static final Logger __log = LoggerFactory.getLogger(LocalEntityResolver.class);
 
   private final HashMap<String, URL> _mappings = new HashMap<String,URL>();
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java
index 47cc81d..15113ac 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.bpel.elang.xpath10.compiler;
 
-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.api.CompilationMessage;
 import org.apache.ode.bpel.compiler.api.CompilerContext;
@@ -37,7 +37,7 @@ import javax.xml.transform.TransformerException;
  */
 public class XslCompilationErrorListener implements ErrorListener {
 
-  private static final Log __log = LogFactory.getLog(XslCompilationErrorListener.class);
+  private static final Logger __log = LoggerFactory.getLogger(XslCompilationErrorListener.class);
   private CompilerContext _cc;
 
   public XslCompilationErrorListener(CompilerContext cc) {
@@ -46,23 +46,23 @@ public class XslCompilationErrorListener implements ErrorListener {
 
   public void warning(TransformerException exception) throws TransformerException {
     if (__log.isWarnEnabled()) {
-      __log.warn(exception);
+      __log.warn("",exception);
     }
     recover(CompilationMessage.WARN, exception);
   }
 
   public void error(TransformerException exception) throws TransformerException {
     if (__log.isErrorEnabled()) {
-      __log.error(exception);
+      __log.error("",exception);
     }
     recover(CompilationMessage.ERROR, exception);
     throw exception;
   }
 
   public void fatalError(TransformerException exception) throws TransformerException {
-    if (__log.isFatalEnabled()) {
-      __log.fatal(exception);
-    }
+    
+    __log.error("",exception);
+    
     recover(CompilationMessage.ERROR, exception);
     throw exception;
   }

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
index ac0cf58..8ccc2d9 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
@@ -40,8 +40,8 @@ import net.sf.saxon.om.NamespaceConstant;
 import net.sf.saxon.xpath.XPathEvaluator;
 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.bpel.compiler.api.CompilationException;
 import org.apache.ode.bpel.compiler.api.CompilerContext;
 import org.apache.ode.bpel.compiler.api.ExpressionCompiler;
@@ -62,7 +62,7 @@ import org.w3c.dom.Node;
  */
 public class XPath20ExpressionCompilerImpl implements ExpressionCompiler {
 
-    protected static final Log __log = LogFactory.getLog(XPath20ExpressionCompilerBPEL20.class);
+    protected static final Logger __log = LoggerFactory.getLogger(XPath20ExpressionCompilerBPEL20.class);
 
     protected String _bpelNS;
     protected QName _qnLinkStatus;
@@ -175,7 +175,7 @@ public class XPath20ExpressionCompilerImpl implements ExpressionCompiler {
                 }
             }
         } catch (XPathExpressionException e) {
-            __log.debug(e);
+            __log.debug("",e);
             __log.info("Couldn't validate properly expression " + xpathStr);
         } catch (WrappedResolverException wre) {
             if (wre._compilationMsg != null)

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java b/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java
index aeaf585..995a8c3 100644
--- a/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java
+++ b/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java
@@ -45,8 +45,8 @@ import net.sf.saxon.om.Validation;
 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.compiler.api.CompilationException;
 import org.apache.ode.bpel.compiler.api.CompilerContext;
 import org.apache.ode.bpel.compiler.api.ExpressionCompiler;
@@ -81,7 +81,7 @@ import org.w3c.dom.NodeList;
  */
 public class XQuery10ExpressionCompilerImpl implements ExpressionCompiler {
 
-    protected static final Log __log = LogFactory.getLog(XQuery10ExpressionCompilerImpl.class);
+    protected static final Logger __log = LoggerFactory.getLogger(XQuery10ExpressionCompilerImpl.class);
 
     protected String _bpelNS;
     protected QName _qnLinkStatus;
@@ -269,7 +269,7 @@ public class XQuery10ExpressionCompilerImpl implements ExpressionCompiler {
                 }
             }
         } catch (XQException xqe) {
-            __log.debug(xqe);
+            __log.debug("",xqe);
             __log.info("Couldn't validate properly expression " + xqueryStr);
             throw new CompilationException(__msgs.errXQuery10Syntax(xqueryStr, "Couldn't validate XQuery expression"));
         } catch (WrappedResolverException wre) {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/AbstractCompileTestCase.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/AbstractCompileTestCase.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/AbstractCompileTestCase.java
index 72a7585..4bc8c0e 100644
--- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/AbstractCompileTestCase.java
+++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/AbstractCompileTestCase.java
@@ -22,8 +22,8 @@ package org.apache.ode.bpel.compiler_2_0;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 
-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.api.CompilationMessage;
 import org.apache.ode.bpel.compiler.api.CompileListener;
@@ -33,7 +33,7 @@ import org.junit.Before;
 
 public abstract class AbstractCompileTestCase implements CompileListener {
 
-    protected final Log __log = LogFactory.getLog(getClass());
+    protected final Logger __log = LoggerFactory.getLogger(getClass());
     protected BpelC _compiler;
     protected ArrayList<CompilationMessage> _errors = new ArrayList<CompilationMessage>();
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java
index 970a351..1dcfd31 100644
--- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java
+++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java
@@ -6,8 +6,8 @@ import java.io.File;
 import java.net.URI;
 import java.net.URL;
 
-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.OProcess;
 import org.apache.ode.bpel.obj.migrate.DeepEqualityHelper;
 import org.apache.ode.bpel.obj.migrate.DomElementComparator;
@@ -19,7 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class MigrationTest extends GoodCompileTest{
-    private static final Log __log = LogFactory.getLog(MigrationTest.class);
+    private static final Logger __log = LoggerFactory.getLogger(MigrationTest.class);
 
     /**
      * compare compiled OProcess with migrated ones.

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/XslTest.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/XslTest.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/XslTest.java
index 963a0e5..efbf6c9 100644
--- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/XslTest.java
+++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/XslTest.java
@@ -22,8 +22,8 @@ import java.io.File;
 import java.net.URI;
 import java.net.URL;
 
-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.BpelCompiler20;
 import org.apache.ode.bpel.compiler.DefaultResourceFinder;
 import org.apache.ode.bpel.compiler.ResourceFinder;
@@ -42,7 +42,7 @@ import org.xml.sax.InputSource;
 
 public class XslTest {
 
-    private final Log __log = LogFactory.getLog(getClass());
+    private final Logger __log = LoggerFactory.getLogger(getClass());
     private BpelCompiler20 _compiler;
     private ResourceFinder _resfinder;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-compiler/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/test/resources/log4j2.xml b/bpel-compiler/src/test/resources/log4j2.xml
new file mode 100644
index 0000000..9f6bc53
--- /dev/null
+++ b/bpel-compiler/src/test/resources/log4j2.xml
@@ -0,0 +1,37 @@
+<Configuration>
+    <Appenders>
+        <File name="FILE" fileName="target/test/test.log" append="false">
+            <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+        </File>
+        <Console name="STDOUT" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+        </Console>
+        <Async name="Async">
+            <AppenderRef ref="FILE"/>
+            <AppenderRef ref="STDOUT"/>
+        </Async>
+    </Appenders>
+
+    <Loggers>
+        <Logger name="org.apache.ode" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.apache.axis2" level="info" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+       <Logger name="org.hibernate" level="warn" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.apache.openjpa" level="warn" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+        <Logger name="org.springframework" level="error" additivity="false">
+            <AppenderRef ref="FILE"/>
+        </Logger>
+
+        <Root level="info">
+            <AppenderRef ref="Async"/>
+        </Root>
+    </Loggers>
+
+</Configuration>

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java b/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java
index 93f2cff..1417624 100644
--- a/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java
+++ b/bpel-epr/src/main/java/org/apache/ode/bpel/common/evt/DebugBpelEventListener.java
@@ -21,8 +21,8 @@ package org.apache.ode.bpel.common.evt;
 import java.util.Properties;
 
 import org.apache.commons.lang.BooleanUtils;
-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.BpelEvent;
 import org.apache.ode.bpel.iapi.BpelEventListener;
 
@@ -40,7 +40,7 @@ import org.apache.ode.bpel.iapi.BpelEventListener;
  * @author Tammo van Lessen (University of Stuttgart)
  */
 public class DebugBpelEventListener implements BpelEventListener {
-    private static final Log __log = LogFactory.getLog(BpelEventListener.class);
+    private static final Logger __log = LoggerFactory.getLogger(BpelEventListener.class);
 
     private static final String SYSOUT_KEY = "debugeventlistener.dumpToStdOut";
     private boolean _dumpToStdOut = false;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
index 1409d9e..7d9768e 100644
--- a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java
+++ b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.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.utils.DOMUtils;
 import org.apache.ode.utils.Namespaces;
 import org.w3c.dom.Element;
@@ -36,7 +36,7 @@ import org.w3c.dom.Element;
  */
 public class EndpointFactory {
 
-    private static final Log __log = LogFactory.getLog(EndpointFactory.class);
+    private static final Logger __log = LoggerFactory.getLogger(EndpointFactory.class);
 
     private static QName WSDL20_ELMT_QNAME = new QName(Namespaces.WSDL_20, "service");
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
index 9a50bdf..47ee2fa 100644
--- a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
+++ b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.bpel.epr;
 
-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.Namespaces;
 import org.w3c.dom.Document;
@@ -37,7 +37,7 @@ import java.util.Map;
  */
 public class WSAEndpoint implements MutableEndpoint {
 
-    private static final Log __log = LogFactory.getLog(WSAEndpoint.class);
+    private static final Logger __log = LoggerFactory.getLogger(WSAEndpoint.class);
 
     private Element _eprElmt;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java b/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java
index fee961c..feb6ff0 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/DynamicService.java
@@ -36,8 +36,8 @@ import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.dom.NamespaceImpl;
-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.pmapi.ProcessInfoCustomizer;
 import org.apache.xmlbeans.XmlObject;
 import org.w3c.dom.Node;
@@ -47,7 +47,7 @@ import org.w3c.dom.Node;
  * invocation based on top-level element name (e.g. method name) and sub-elements (e.g. parameters).
  */
 public class DynamicService<T> {
-    private final Log __log = LogFactory.getLog(getClass());
+    private final Logger __log = LoggerFactory.getLogger(getClass());
 
     static final OMFactory OM = OMAbstractFactory.getOMFactory();
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/EmbeddedGeronimoFactory.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/EmbeddedGeronimoFactory.java b/bpel-epr/src/main/java/org/apache/ode/il/EmbeddedGeronimoFactory.java
index b1d4739..304897b 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/EmbeddedGeronimoFactory.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/EmbeddedGeronimoFactory.java
@@ -19,14 +19,14 @@
 
 package org.apache.ode.il;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 
 import javax.transaction.TransactionManager;
 
 public class EmbeddedGeronimoFactory {
-    private static final Log LOG = LogFactory.getLog(EmbeddedGeronimoFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EmbeddedGeronimoFactory.class);
 
     /* Public no-arg contructor is required */
     public EmbeddedGeronimoFactory() {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java b/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java
index ec90ebc..18ae1ec 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/MockScheduler.java
@@ -36,8 +36,8 @@ import javax.transaction.Synchronization;
 import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.iapi.ContextException;
 import org.apache.ode.bpel.iapi.Scheduler;
 
@@ -45,7 +45,7 @@ import org.apache.ode.bpel.iapi.Scheduler;
  * @author Matthieu Riou <mriou at apache dot org>
  */
 public class MockScheduler implements Scheduler {
-    private static final Log __log = LogFactory.getLog(MockScheduler.class);
+    private static final Logger __log = LoggerFactory.getLogger(MockScheduler.class);
 
     private JobProcessor _processor;
     private ExecutorService _executorSvc = Executors.newCachedThreadPool();

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java b/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
index 0ad4580..6df7cbf 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java
@@ -35,8 +35,8 @@ import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMText;
-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.NSContext;
 import org.w3c.dom.Attr;
@@ -54,7 +54,7 @@ import org.xml.sax.InputSource;
  */
 public class OMUtils {
 
-    private static Log __log = LogFactory.getLog(OMUtils.class);
+    private static Logger __log = LoggerFactory.getLogger(OMUtils.class);
 
     public static OMElement getFirstChildWithName(OMElement parent, String name) {
         if (parent == null)

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
index cc519bd..c03edf6 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
@@ -19,8 +19,8 @@
 
 package org.apache.ode.il.config;
 
-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.SystemUtils;
 
 import java.io.File;
@@ -38,7 +38,7 @@ import java.util.Properties;
 public class OdeConfigProperties {
     private static final long serialVersionUID = 1L;
 
-    private static final Log __log = LogFactory.getLog(OdeConfigProperties.class);
+    private static final Logger __log = LoggerFactory.getLogger(OdeConfigProperties.class);
 
     public static final String PROP_DB_MODE = "db.mode";
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
index 9d8c04d..de6cd03 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
@@ -23,8 +23,8 @@ import java.io.File;
 import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
 import org.apache.ode.il.config.OdeConfigProperties;
 import org.apache.ode.utils.LoggingInterceptor;
@@ -34,9 +34,9 @@ import org.apache.ode.utils.LoggingInterceptor;
  *
  */
 public abstract class Database {
-    protected static final Log __log = LogFactory.getLog(Database.class);
+    protected static final Logger __log = LoggerFactory.getLogger(Database.class);
 
-    protected static final Log __logSql = LogFactory.getLog("org.apache.ode.sql");
+    protected static final Logger __logSql = LoggerFactory.getLogger("org.apache.ode.sql");
 
     protected static final Messages __msgs = Messages.getMessages(Messages.class);
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java
index 2ef9732..c965cc2 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java
@@ -22,8 +22,8 @@ package org.apache.ode.il.dbutil;
 import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.connector.outbound.GenericConnectionManager;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
@@ -38,7 +38,7 @@ import org.tranql.connector.jdbc.JDBCDriverMCF;
 public class DatabaseConnectionManager {
 
     private static final long serialVersionUID = 1L;
-    private static final Log __log = LogFactory.getLog(DatabaseConnectionManager.class);
+    private static final Logger __log = LoggerFactory.getLogger(DatabaseConnectionManager.class);
     private static final Messages __msgs = Messages.getMessages(Messages.class);
     private static final int CONNECTION_MAX_WAIT_MILLIS = 30000;
     private static final int CONNECTION_MAX_IDLE_MINUTES = 5;
@@ -114,4 +114,4 @@ public class DatabaseConnectionManager {
     public DataSource getDataSource() {
         return _dataSource;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DerbyEmbeddedDB.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DerbyEmbeddedDB.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DerbyEmbeddedDB.java
index c98f93b..efb27b7 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DerbyEmbeddedDB.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DerbyEmbeddedDB.java
@@ -47,7 +47,7 @@ public class DerbyEmbeddedDB extends InternalDB {
             try {
                 DriverManager.getConnection(_dbUrl).close();
             } catch (SQLException se) {
-                __log.error(se);
+                __log.error("",se);
             }
             EmbeddedDataSource dds = new EmbeddedDataSource();
             dds.setDatabaseName("memory:" + _dbName);

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-epr/src/main/java/org/apache/ode/il/dbutil/InternalDB.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/InternalDB.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/InternalDB.java
index 465d13b..adcc60c 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/InternalDB.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/InternalDB.java
@@ -68,7 +68,7 @@ public class InternalDB extends Database {
     protected void shutdownDB() {}
     
     protected void initDataSource() throws DatabaseConfigException {
-        __log.info(__msgs.msgOdeUsingInternalDb(_odeConfig.getDbIntenralJdbcUrl(), _odeConfig.getDbInternalJdbcDriverClass()));
+        __log.info("",__msgs.msgOdeUsingInternalDb(_odeConfig.getDbIntenralJdbcUrl(), _odeConfig.getDbInternalJdbcDriverClass()));
         initInternalDb(_odeConfig.getDbIntenralJdbcUrl(), _odeConfig.getDbInternalJdbcDriverClass(),
                 _odeConfig.getDbInternalUserName(), _odeConfig.getDbInternalPassword());
     }

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java
index 5ddab47..a3430c5 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java
@@ -13,8 +13,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * compare two object for equality. default strategy:
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DeepEqualityHelper{
 
-	private static final Log __log = LogFactory.getLog(ObjectTraverser.class);
+	private static final Logger __log = LoggerFactory.getLogger(ObjectTraverser.class);
     public boolean logFalseThrough = false;
     private Stack<String> st = new Stack<String>();
     

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DomElementComparator.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DomElementComparator.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DomElementComparator.java
index 92b496c..ec4b0ca 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DomElementComparator.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DomElementComparator.java
@@ -9,8 +9,8 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.ls.DOMImplementationLS;
@@ -21,7 +21,7 @@ import org.w3c.dom.ls.LSSerializer;
  * @see DeepEqualityHelper
  */
 public class DomElementComparator implements EqualityComparator{
-    private static final Log __log = LogFactory.getLog(DomElementComparator.class);
+    private static final Logger __log = LoggerFactory.getLogger(DomElementComparator.class);
 	private DeepEqualityHelper deepEquality;
 	@Override
 	public Boolean objectsEqual(Object obj1, Object obj2) {

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java
index 17a14d9..6f2bd5f 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java
@@ -6,8 +6,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 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.DebugInfo;
 import org.apache.ode.bpel.obj.ExtensibleImpl;
 import org.apache.ode.bpel.obj.OProcess;
@@ -17,7 +17,7 @@ import org.apache.ode.bpel.obj.OProcess;
  * @see DeepEqualityHelper
  */
 public class ExtensibeImplEqualityComp implements EqualityComparator{
-    private static final Log __log = LogFactory.getLog(ExtensibeImplEqualityComp.class);
+    private static final Logger __log = LoggerFactory.getLogger(ExtensibeImplEqualityComp.class);
 	private DeepEqualityHelper deepEquality;
 	public ExtensibeImplEqualityComp() {
 	}

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ObjectTraverser.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ObjectTraverser.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ObjectTraverser.java
index 30865dd..56a991d 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ObjectTraverser.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ObjectTraverser.java
@@ -6,15 +6,15 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Traverse an Object with help of an {@link ObjectVisitor}, taking into consideration of cyclic references.
  * 
  */
 public class ObjectTraverser{
-    private static final Log __log = LogFactory.getLog(ObjectTraverser.class);
+    private static final Logger __log = LoggerFactory.getLogger(ObjectTraverser.class);
 
     private HandleTable htab = new HandleTable(1000, 0.8f);
 	private ObjectVisitor visitor;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/OmOld2new.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/OmOld2new.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/OmOld2new.java
index 31f5280..4fedd01 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/OmOld2new.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/OmOld2new.java
@@ -12,8 +12,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 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.ExtensibleImpl;
 
 /**
@@ -22,7 +22,7 @@ import org.apache.ode.bpel.obj.ExtensibleImpl;
  * @see ObjectTraverser
  */
 public class OmOld2new extends AbstractObjectVisitor{
-    private static final Log __log = LogFactory.getLog(OmOld2new.class);
+    private static final Logger __log = LoggerFactory.getLogger(OmOld2new.class);
     
 	private static Map<String, String> beanPkgMap = new HashMap<String, String>();
 	static{

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/UpgradeChecker.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/UpgradeChecker.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/UpgradeChecker.java
index 41809d8..66d4354 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/UpgradeChecker.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/UpgradeChecker.java
@@ -3,8 +3,8 @@ package org.apache.ode.bpel.obj.migrate;
 import java.lang.reflect.Field;
 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.obj.ExtensibleImpl;
 
 /**
@@ -14,7 +14,7 @@ import org.apache.ode.bpel.obj.ExtensibleImpl;
  * @see ObjectTraverser
  */
 public class UpgradeChecker extends AbstractObjectVisitor{
-    private static final Log __log = LogFactory.getLog(UpgradeChecker.class);
+    private static final Logger __log = LoggerFactory.getLogger(UpgradeChecker.class);
 
     private boolean newest = true;
 	@Override

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java
index 300ca12..6860741 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java
@@ -17,8 +17,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.o.Serializer;
 import org.apache.ode.bpel.obj.OProcess;
 import org.apache.ode.bpel.obj.OProcessWrapper;
@@ -34,7 +34,7 @@ import org.apache.ode.bpel.obj.serde.OmSerdeFactory.SerializeFormat;
  * @see OmSerdeFactory
  */
 public class DeSerializer {
-	private static final Log __log = LogFactory.getLog(DeSerializer.class);
+	private static final Logger __log = LoggerFactory.getLogger(DeSerializer.class);
 
 	private OProcessWrapper wrapper = new OProcessWrapper();
 	private InputStream is;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java
index d8918d7..8953ac9 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java
@@ -12,8 +12,8 @@ import java.util.Vector;
 import javax.wsdl.OperationType;
 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.obj.OProcess;
 import org.apache.ode.bpel.obj.serde.jacksonhack.TypeBeanSerializerFactory;
 import org.apache.ode.utils.NSContext;
@@ -47,8 +47,7 @@ import com.ibm.wsdl.MessageImpl;
  * @see JsonOmSerializer
  */
 public class JsonOmDeserializer implements OmDeserializer {
-	protected static final Log __log = LogFactory
-			.getLog(JsonOmDeserializer.class);
+	protected static final Logger __log = LoggerFactory.getLogger(JsonOmDeserializer.class);
 
 	private OProcess process;
 	private InputStream is;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java
----------------------------------------------------------------------
diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java
index 9f0c762..1ec6778 100644
--- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java
+++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java
@@ -11,8 +11,8 @@ import java.util.Vector;
 import javax.wsdl.OperationType;
 import javax.wsdl.Part;
 
-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.OProcess;
 import org.apache.ode.bpel.obj.serde.jacksonhack.TypeBeanSerializerFactory;
 import org.apache.ode.utils.NSContext;
@@ -38,8 +38,7 @@ import com.ibm.wsdl.MessageImpl;
  * @see JsonOmDeserializer
  */
 public class JsonOmSerializer implements OmSerializer {
-	protected static final Log __log = LogFactory
-			.getLog(JsonOmSerializer.class);
+	protected static final Logger __log = LoggerFactory.getLogger(JsonOmSerializer.class);
 
 	private OutputStream os;
 	private OProcess process;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/XslRuntimeUriResolver.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/XslRuntimeUriResolver.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/XslRuntimeUriResolver.java
index 38395f6..21f5fbe 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/XslRuntimeUriResolver.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/XslRuntimeUriResolver.java
@@ -30,8 +30,8 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.bpel.elang.xpath10.obj.OXPath10Expression;
 import org.apache.ode.bpel.obj.OXslSheet;
 import org.apache.ode.utils.StreamUtils;
@@ -44,7 +44,7 @@ import org.apache.ode.utils.fs.FileUtils;
  */
 public class XslRuntimeUriResolver implements URIResolver {
 
-    private static final Log __log = LogFactory.getLog(XslRuntimeUriResolver.class);
+    private static final Logger __log = LoggerFactory.getLogger(XslRuntimeUriResolver.class);
 
     private OXPath10Expression _expr;
     private final URI _baseResourceURI;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
index 0abee3c..94abe32 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
@@ -29,8 +29,8 @@ import javax.xml.transform.dom.DOMSource;
 
 import net.sf.saxon.dom.NodeWrapper;
 
-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.elang.XslRuntimeUriResolver;
 import org.apache.ode.bpel.elang.xpath10.obj.OXPath10Expression;
@@ -63,7 +63,7 @@ import org.w3c.dom.Node;
  * {@link EvaluationContext}.
  */
 class JaxenContexts implements FunctionContext, VariableContext {
-    private static final Log __log = LogFactory.getLog(JaxenContexts.class);
+    private static final Logger __log = LoggerFactory.getLogger(JaxenContexts.class);
 
     /** Static, thread-safe singleton implementing default XPath functions */
     private static final FunctionContext __defaultXPathFunctions = XPathFunctionContext.getInstance();
@@ -247,9 +247,8 @@ class JaxenContexts implements FunctionContext, VariableContext {
 
             OXPath10Expression.OSigGetVariableData sig = _oxpath.resolveGetVariableDataSig(varname,partname,xpathStr);
             if (sig == null) {
-                String msg = "InternalError: Attempt to use an unknown getVariableData signature: " + args;
-                if (__log.isFatalEnabled())
-                    __log.fatal(msg);
+                String msg = "InternalError: Attempt to use an unknown getVariableData signature: " + args;                
+                __log.error(msg);
                 throw new FunctionCallException(msg);
             }
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenNamespaceContextAdapter.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenNamespaceContextAdapter.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenNamespaceContextAdapter.java
index b29a7a2..9601882 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenNamespaceContextAdapter.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenNamespaceContextAdapter.java
@@ -18,8 +18,8 @@
  */
 package org.apache.ode.bpel.elang.xpath10.runtime;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jaxen.NamespaceContext;
 
 /**
@@ -28,7 +28,7 @@ import org.jaxen.NamespaceContext;
  * @pattern Adapter
  */
 class JaxenNamespaceContextAdapter implements NamespaceContext {
-  private static final Log __log = LogFactory.getLog(JaxenNamespaceContextAdapter.class);
+  private static final Logger __log = LoggerFactory.getLogger(JaxenNamespaceContextAdapter.class);
 
   private javax.xml.namespace.NamespaceContext _namespaceContext;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntime.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntime.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntime.java
index f2a5476..f60840f 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntime.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntime.java
@@ -18,8 +18,8 @@
  */
 package org.apache.ode.bpel.elang.xpath10.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.elang.xpath10.obj.OXPath10Expression;
 import org.apache.ode.bpel.explang.ConfigurationException;
@@ -54,7 +54,7 @@ import java.util.Map;
  */
 public class XPath10ExpressionRuntime implements ExpressionLanguageRuntime {
     /** Class-level logger. */
-    private static final Log __log = LogFactory.getLog(XPath10ExpressionRuntime.class);
+    private static final Logger __log = LoggerFactory.getLogger(XPath10ExpressionRuntime.class);
 
     /** Compiled expression cache. */
     private final Map<String, XPath> _compiledExpressions = new HashMap<String, XPath>();

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java
index 5dd082d..14430eb 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java
@@ -45,8 +45,8 @@ import net.sf.saxon.value.SequenceExtent;
 import net.sf.saxon.value.YearMonthDurationValue;
 
 import org.apache.commons.httpclient.URIException;
-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.elang.XslRuntimeUriResolver;
 import org.apache.ode.bpel.elang.xpath10.obj.OXPath10Expression;
@@ -74,7 +74,7 @@ import org.w3c.dom.Text;
  */
 public class JaxpFunctionResolver implements XPathFunctionResolver {
 
-    private static final Log __log = LogFactory.getLog(JaxpFunctionResolver.class);
+    private static final Logger __log = LoggerFactory.getLogger(JaxpFunctionResolver.class);
 
     private EvaluationContext _ectx;
     private OXPath20ExpressionBPEL20 _oxpath;
@@ -175,8 +175,7 @@ public class JaxpFunctionResolver implements XPathFunctionResolver {
             OXPath10Expression.OSigGetVariableData sig = _oxpath.resolveGetVariableDataSig(varname, partname, xpathStr);
             if (sig == null) {
                 String msg = "InternalError: Attempt to use an unknown getVariableData signature: " + args;
-                if (__log.isFatalEnabled())
-                    __log.fatal(msg);
+                __log.error(msg);
                 throw new XPathFunctionException(msg);
             }
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
index 2f6a405..bdb9af6 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
@@ -31,8 +31,8 @@ import net.sf.saxon.value.EmptySequence;
 import net.sf.saxon.value.StringValue;
 import net.sf.saxon.value.Value;
 
-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.elang.xpath10.obj.OXPath10ExpressionBPEL20;
 import org.apache.ode.bpel.elang.xpath20.compiler.WrappedResolverException;
@@ -50,7 +50,7 @@ import org.w3c.dom.Node;
  */
 public class JaxpVariableResolver implements XPathVariableResolver {
 
-    private static final Log __log = LogFactory.getLog(JaxpVariableResolver.class);
+    private static final Logger __log = LoggerFactory.getLogger(JaxpVariableResolver.class);
 
     private EvaluationContext _ectx;
     private OXPath10ExpressionBPEL20 _oxpath;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
index 74ac7e0..73d2acd 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
@@ -38,8 +38,8 @@ import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.DurationValue;
 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.bpel.common.FaultException;
 import org.apache.ode.bpel.elang.xpath10.obj.OXPath10Expression;
 import org.apache.ode.bpel.elang.xpath20.compiler.WrappedResolverException;
@@ -72,7 +72,7 @@ public class XPath20ExpressionRuntime implements ExpressionLanguageRuntime {
     static final short NUMBER_TYPE = 5;
 
     /** Class-level logger. */
-    private static final Log __log = LogFactory.getLog(XPath20ExpressionRuntime.class);
+    private static final Logger __log = LoggerFactory.getLogger(XPath20ExpressionRuntime.class);
     
     private final XPathFactory _xpf = new XPathFactoryImpl();
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java
index 5678b51..36bf2ea 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java
@@ -56,8 +56,8 @@ import net.sf.saxon.xqj.SaxonXQConnection;
 import net.sf.saxon.xqj.SaxonXQDataSource;
 import net.sf.saxon.xqj.SaxonXQItem;
 
-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.elang.xpath20.compiler.Constants;
 import org.apache.ode.bpel.elang.xpath20.compiler.WrappedResolverException;
@@ -94,7 +94,7 @@ public class XQuery10ExpressionRuntime implements ExpressionLanguageRuntime {
     static final short NUMBER_TYPE = 5;
 
     /** Class-level logger. */
-    private static final Log __log = LogFactory.getLog(XQuery10ExpressionRuntime.class);
+    private static final Logger __log = LoggerFactory.getLogger(XQuery10ExpressionRuntime.class);
 
     /**
      * Creates a new XQuery10ExpressionRuntime object.

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java
index 8f4706a..d933730 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java
@@ -26,14 +26,14 @@ import org.apache.ode.bpel.dao.BpelDAOConnection;
 import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
 import org.apache.ode.bpel.iapi.Scheduler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Encapsulates transactional access to the BPEL database.
  */
 public class BpelDatabase {
-  static Log __log = LogFactory.getLog(BpelDatabase.class);
+  static Logger __log = LoggerFactory.getLogger(BpelDatabase.class);
 
   protected BpelDAOConnectionFactory _sscf;
   protected Scheduler _scheduler;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
index b0473bc..da4f86c 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.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.clapi.ClusterLock;
 import org.apache.ode.bpel.dao.MessageExchangeDAO;
 import org.apache.ode.bpel.dao.ProcessDAO;
@@ -76,7 +76,7 @@ import java.util.concurrent.TimeUnit;
  * @author Matthieu Riou <mriou at apache dot org>
  */
 public class BpelEngineImpl implements BpelEngine {
-    private static final Log __log = LogFactory.getLog(BpelEngineImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(BpelEngineImpl.class);
 
     /** RNG, for delays */
     private Random _random = new Random(System.currentTimeMillis());
@@ -265,7 +265,7 @@ public class BpelEngineImpl implements BpelEngine {
             break;
         default:
             String errmsg = "BpelEngineImpl: internal error, invalid MexDAO direction: " + mexId;
-            __log.fatal(errmsg);
+            __log.error(errmsg);
             throw new BpelEngineException(errmsg);
         }
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
index e8d0580..5858d93 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
@@ -32,8 +32,8 @@ import java.util.concurrent.Callable;
 import javax.wsdl.Fault;
 import javax.xml.namespace.QName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.ode.agents.memory.SizingAgent;
 import org.apache.ode.bpel.common.FaultException;
 import org.apache.ode.bpel.common.ProcessState;
@@ -89,7 +89,7 @@ import org.w3c.dom.Text;
  * @author Matthieu Riou <mriou at apache dot org>
  */
 public class BpelProcess {
-    static final Log __log = LogFactory.getLog(BpelProcess.class);
+    static final Logger __log = LoggerFactory.getLogger(BpelProcess.class);
 
     private static final Messages __msgs = MessageBundle.getMessages(Messages.class);
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java
index f6b4b2e..f2c4cab 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java
@@ -24,14 +24,14 @@ import org.apache.ode.bpel.iapi.Scheduler;
 
 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;
 
 /**
  * Encapusulates access to a BPEL process database.
  */
 class BpelProcessDatabase extends BpelDatabase {
-  static Log __log = LogFactory.getLog(BpelProcessDatabase.class);
+  static Logger __log = LoggerFactory.getLogger(BpelProcessDatabase.class);
 
   private QName _processId;
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
index 7ceac7c..97544bd 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
@@ -31,8 +31,8 @@ import java.util.List;
 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.CorrelationKey;
 import org.apache.ode.bpel.common.CorrelationKeySet;
 import org.apache.ode.bpel.common.FaultException;
@@ -108,7 +108,7 @@ import org.w3c.dom.NodeList;
 
 public class BpelRuntimeContextImpl implements BpelRuntimeContext {
 
-    private static final Log __log = LogFactory.getLog(BpelRuntimeContextImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(BpelRuntimeContextImpl.class);
 
     /** Data-access object for process instance. */
     protected ProcessInstanceDAO _dao;
@@ -1214,14 +1214,14 @@ public class BpelRuntimeContextImpl implements BpelRuntimeContext {
         if (dao == null) {
             // this should not happen....
             String msg = "Engine requested non-existent message exchange: " + mexId;
-            __log.fatal(msg);
+            __log.error(msg);
             throw new BpelEngineException(msg);
         }
 
         if (dao.getDirection() != MessageExchangeDAO.DIR_PARTNER_INVOKES_MYROLE) {
             // this should not happen....
             String msg = "Engine requested my-role request for a partner-role mex: " + mexId;
-            __log.fatal(msg);
+            __log.error(msg);
             throw new BpelEngineException(msg);
         }
 
@@ -1235,7 +1235,7 @@ public class BpelRuntimeContextImpl implements BpelRuntimeContext {
                 if (request == null) {
                     // this also should not happen
                     String msg = "Engine requested request for message exchange that did not have one: " + mexId;
-                    __log.fatal(msg);
+                    __log.error(msg);
                     throw new BpelEngineException(msg);
                 }
                 return mergeHeaders(request);
@@ -1243,7 +1243,7 @@ public class BpelRuntimeContextImpl implements BpelRuntimeContext {
                 // We should not be in any other state when requesting this.
                 String msg = "Engine requested response while the message exchange " + mexId + " was in the state "
                         + status;
-                __log.fatal(msg);
+                __log.error(msg);
                 throw new BpelEngineException(msg);
         }
     }
@@ -1289,13 +1289,13 @@ public class BpelRuntimeContextImpl implements BpelRuntimeContext {
         if (dao == null) {
             // this should not happen....
             String msg = "Engine requested non-existent message exchange: " + mexId;
-            __log.fatal(msg);
+            __log.error(msg);
             throw new BpelEngineException(msg);
         }
         if (dao.getDirection() != MessageExchangeDAO.DIR_BPEL_INVOKES_PARTNERROLE) {
             // this should not happen....
             String msg = "Engine requested partner response for a my-role mex: " + mexId;
-            __log.fatal(msg);
+            __log.error(msg);
             throw new BpelEngineException(msg);
         }
 
@@ -1308,7 +1308,7 @@ public class BpelRuntimeContextImpl implements BpelRuntimeContext {
                 if (response == null) {
                     // this also should not happen
                     String msg = "Engine requested response for message exchange that did not have one: " + mexId;
-                    __log.fatal(msg);
+                    __log.error(msg);
                     throw new BpelEngineException(msg);
                 }
                 break;
@@ -1319,7 +1319,7 @@ public class BpelRuntimeContextImpl implements BpelRuntimeContext {
                 // We should not be in any other state when requesting this.
                 String msg = "Engine requested response while the message exchange " + mexId + " was in the state "
                         + status;
-                __log.fatal(msg);
+                __log.error(msg);
                 throw new BpelEngineException(msg);
         }
         return response;

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
index 2334262..3966fc1 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
@@ -33,8 +33,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 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.clapi.ClusterManager;
 import org.apache.ode.bpel.dao.BpelDAOConnection;
 import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
@@ -83,7 +83,7 @@ import org.apache.ode.utils.xsl.XslTransformHandler;
  * @author Matthieu Riou <mriou at apache dot org>
  */
 public class BpelServerImpl implements BpelServer, Scheduler.JobProcessor {
-    private static final Log __log = LogFactory.getLog(BpelServerImpl.class);
+    private static final Logger __log = LoggerFactory.getLogger(BpelServerImpl.class);
 
     private static final Messages __msgs = MessageBundle.getMessages(Messages.class);
 

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/CustomProcessProperties.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/CustomProcessProperties.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/CustomProcessProperties.java
index c8f17ec..9c7c21a 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/CustomProcessProperties.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/CustomProcessProperties.java
@@ -23,15 +23,15 @@ import java.net.InetAddress;
 
 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.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 public class CustomProcessProperties {
-    private static final Log __log = LogFactory.getLog(CustomProcessProperties.class);
+    private static final Logger __log = LoggerFactory.getLogger(CustomProcessProperties.class);
 
     public Node getProperty(QName propertyName) {
         String name = propertyName.getLocalPart();

http://git-wip-us.apache.org/repos/asf/ode/blob/573900b7/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java
index 34031ca..ec64736 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.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.DebuggerContext;
 import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
 import org.apache.ode.bpel.iapi.Scheduler.JobType;
@@ -62,7 +62,7 @@ import java.util.Set;
  */
 public class DebuggerSupport implements DebuggerContext {
 
-    private static final Log __log = LogFactory.getLog(DebuggerSupport.class);
+    private static final Logger __log = LoggerFactory.getLogger(DebuggerSupport.class);
     private static final Messages __msgs = MessageBundle.getMessages(Messages.class);
 
     static final Breakpoint[] EMPTY_BP = new Breakpoint[0];


Mime
View raw message