You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2015/08/20 19:17:42 UTC
[4/5] ode git commit: ODE-983: Migrated to SLF4J and Log4j2
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java b/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
index 985e324..087a446 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/URLEncodedTransformer.java
@@ -21,8 +21,8 @@ package org.apache.ode.axis2.util;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.util.EncodingUtil;
-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.axis2.httpbinding.Messages;
import org.w3c.dom.Element;
@@ -39,7 +39,7 @@ import java.util.ArrayList;
public class URLEncodedTransformer {
- private static final Log log = LogFactory.getLog(URLEncodedTransformer.class);
+ private static final Logger log = LoggerFactory.getLogger(URLEncodedTransformer.class);
/**
* @param values - a map<String, Element>, the key is a part name (without curly braces), the value the replacement value for the part name. If the value is not a simple type, it will be skipped.
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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/5e73553c/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/5e73553c/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 46e0d22..80f1318 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/5e73553c/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 eff74b5..06305a0 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/5e73553c/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 82645ea..3f5efc0 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
@@ -29,8 +29,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;
@@ -52,7 +52,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);
@@ -336,7 +336,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/5e73553c/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 e8b20bb..843f757 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
@@ -45,8 +45,8 @@ import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-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;
@@ -135,7 +135,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/5e73553c/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 49d4958..33784a8 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/5e73553c/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 afd8962..98cde37 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.o.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/5e73553c/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 d672899..1dd5bce 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/5e73553c/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 77039b6..c7c1e98 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/5e73553c/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 1fe1dde..2e5f56d 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/5e73553c/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 6f0ae26..f0ee321 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/5e73553c/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 db2b7c6..c4eaac5 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/5e73553c/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 1732f00..54430cd 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.bom.IfActivity.Case;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.XMLParserUtils;
@@ -38,7 +38,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/";
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 712e281..8794eb6 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/5e73553c/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..236025f 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,21 @@ 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/5e73553c/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 ee543ab..d57d9d1 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;
@@ -63,8 +63,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;
@@ -195,8 +194,7 @@ public class XPath20ExpressionCompilerImpl implements ExpressionCompiler {
}
}
} catch (XPathExpressionException e) {
- __log.debug(e);
- __log.info("Couldn't validate properly expression " + xpathStr);
+ __log.error("Couldn't validate properly expression " + xpathStr,e);
} catch (WrappedResolverException wre) {
if (wre._compilationMsg != null)
throw new CompilationException(wre._compilationMsg, wre);
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 b57c927..e8cbb5b 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,8 +269,7 @@ public class XQuery10ExpressionCompilerImpl implements ExpressionCompiler {
}
}
} catch (XQException xqe) {
- __log.debug(xqe);
- __log.info("Couldn't validate properly expression " + xqueryStr);
+ __log.error("Couldn't validate properly expression " + xqueryStr, xqe);
throw new CompilationException(__msgs.errXQuery10Syntax(xqueryStr, "Couldn't validate XQuery expression"));
} catch (WrappedResolverException wre) {
if (wre._compilationMsg != null)
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java
----------------------------------------------------------------------
diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java
index 50510f4..82ec845 100644
--- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java
+++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
import junit.framework.TestCase;
-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;
@@ -39,7 +39,7 @@ import org.apache.ode.utils.StreamUtils;
*/
class GoodCompileTCase extends TestCase implements CompileListener {
- protected final Log __log = LogFactory.getLog(getClass());
+ protected final Logger __log = LoggerFactory.getLogger(getClass());
private BpelC _compiler;
private ArrayList<CompilationMessage> _errors = new ArrayList<CompilationMessage>();
private String _bpel;
@@ -63,7 +63,7 @@ class GoodCompileTCase extends TestCase implements CompileListener {
File bpelFile = new File(getClass().getResource(_bpel).toURI().getPath());
_compiler.compile(bpelFile, 0);
} catch (Exception ex) {
- __log.error(ex);
+ __log.error("",ex);
fail("Compilation did not succeed.");
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 ae95cc3..f133821 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/5e73553c/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..21313ee
--- /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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 95b52ac..1fcffd8 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/5e73553c/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 bba697e..7e50e4d 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/5e73553c/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 e2ad489..0c5997a 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;
@@ -185,7 +185,7 @@ public class WSAEndpoint implements MutableEndpoint {
try {
serviceNS = _eprElmt.getOwnerDocument().lookupNamespaceURI(prefix);
} catch (Exception e) {
- __log.error(e);
+ __log.error("",e);
}
// Lookup failed, checking directly on our element
if (serviceNS == null) {
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 b1153f0..343cf28 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/5e73553c/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/5e73553c/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 89487d9..d529b65 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/5e73553c/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 43a215c..45a66f6 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/5e73553c/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 6f16f7d..24f9371 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
@@ -26,8 +26,8 @@ import java.io.IOException;
import java.util.Map;
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.utils.SystemUtils;
/**
@@ -38,7 +38,7 @@ import org.apache.ode.utils.SystemUtils;
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";
@@ -182,7 +182,7 @@ public class OdeConfigProperties {
try {
fis.close();
} catch (Exception ex) {
- __log.error(ex);
+ __log.error("",ex);
}
}
} else {
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 226382b..b0a84c4 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);
@@ -124,4 +124,4 @@ public abstract class Database {
return cf;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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/5e73553c/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 52d367a..5973f34 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/5e73553c/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 3c8deaf..c7aaa2e 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()).toString());
initInternalDb(_odeConfig.getDbIntenralJdbcUrl(), _odeConfig.getDbInternalJdbcDriverClass(),
_odeConfig.getDbInternalUserName(), _odeConfig.getDbInternalPassword());
}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 136a787..9ea44e5 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.o.OXPath10Expression;
import org.apache.ode.bpel.o.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/5e73553c/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 96ede14..23ed106 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.o.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();
@@ -248,8 +248,7 @@ 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);
+ __log.error(msg);
throw new FunctionCallException(msg);
}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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/5e73553c/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 2b255af..afbc912 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.o.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/5e73553c/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 9016eab..8e72211 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.o.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/5e73553c/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 2fc1097..b60d533 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.o.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/5e73553c/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 3d3d2d8..240577c 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.o.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/5e73553c/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 e102e5a..5aae632 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/5e73553c/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 7343514..147a0f0 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/5e73553c/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 b24c643..0cbb05e 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
@@ -32,8 +32,8 @@ import javax.wsdl.Operation;
import javax.wsdl.PortType;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
@@ -77,7 +77,7 @@ import org.w3c.dom.Element;
* @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());
@@ -258,7 +258,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/5e73553c/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 bbe4cab..bbf6aff 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
@@ -33,8 +33,8 @@ import java.util.concurrent.Executors;
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;
@@ -87,7 +87,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/5e73553c/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 ff2b73f..ebdf0a6 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/5e73553c/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 fcf1645..8ac70c3 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
@@ -33,8 +33,8 @@ import javax.wsdl.Fault;
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;
@@ -115,7 +115,7 @@ import org.w3c.dom.Document;
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;
@@ -1271,14 +1271,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);
}
@@ -1292,7 +1292,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);
@@ -1300,7 +1300,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);
}
}
@@ -1346,13 +1346,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);
}
@@ -1365,7 +1365,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;
@@ -1376,7 +1376,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/5e73553c/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 c8d0bdf..58ce73f 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.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.dao.DeferredProcessInstanceCleanable;
@@ -82,7 +82,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);
@@ -482,7 +482,7 @@ public class BpelServerImpl implements BpelServer, Scheduler.JobProcessor {
}
}
} catch (InterruptedException e) {
- __log.debug(e);
+ __log.debug("",e);
}
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/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 22c031b..8d6a707 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];
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
index 042ad70..8ce5d37 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/IMAManager.java
@@ -31,8 +31,8 @@ import java.util.Set;
import javax.wsdl.OperationType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFactory;
public class IMAManager implements Serializable {
private static final long serialVersionUID = -5556374398943757951L;
- private static final Log __log = LogFactory.getLog(IMAManager.class);
+ private static final Logger __log = LoggerFactory.getLogger(IMAManager.class);
// holds rid for registered IMAs
public final Map<RequestIdTuple, Entry> _byRid = new HashMap<RequestIdTuple, Entry>();
@@ -88,7 +88,7 @@ public class IMAManager implements Serializable {
if (_byChannel.containsKey(pickResponseChannel)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
@@ -97,7 +97,7 @@ public class IMAManager implements Serializable {
final RequestIdTuple rid = new RequestIdTuple(selectors[i].plinkInstance, selectors[i].opName);
if (_byRid.containsKey(rid)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RID " + rid;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalStateException(errmsg);
}
_byRid.put(rid, entry);
@@ -147,7 +147,7 @@ public class IMAManager implements Serializable {
while (_byRid.values().remove(entry));
} else if (!isTimer){
String errmsg = "INTERNAL ERROR: No ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
index 647066b..d1c520e 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.engine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.Lock;
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*/
public class InstanceLockManager {
- private static final Log __log = LogFactory.getLog(InstanceLockManager.class);
+ private static final Logger __log = LoggerFactory.getLogger(InstanceLockManager.class);
private final Lock _mutex = new java.util.concurrent.locks.ReentrantLock();
private final Map<Long, InstanceInfo> _locks = new HashMap<Long,InstanceInfo> ();
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
index 1486566..ef875d1 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.engine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.iapi.BpelEngineException;
@@ -37,7 +37,7 @@ import java.util.Set;
abstract class MessageExchangeImpl implements MessageExchange {
- private static final Log __log = LogFactory.getLog(MessageExchangeImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(MessageExchangeImpl.class);
protected static final Messages __msgs = MessageBundle.getMessages(Messages.class);
/** Process-Instance identifier.*/
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
index e2efa92..c61a16f 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
@@ -31,8 +31,8 @@ import java.util.concurrent.TimeoutException;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.engine.replayer.Replayer;
import org.apache.ode.bpel.iapi.Message;
@@ -52,7 +52,7 @@ import org.w3c.dom.Node;
public class MyRoleMessageExchangeImpl extends MessageExchangeImpl implements MyRoleMessageExchange {
- private static final Log __log = LogFactory.getLog(MyRoleMessageExchangeImpl.class);
+ private static final Logger __log = LoggerFactory.getLogger(MyRoleMessageExchangeImpl.class);
protected BpelProcess _process;
@@ -110,7 +110,7 @@ public class MyRoleMessageExchangeImpl extends MessageExchangeImpl implements My
public Future invoke(Message request) {
if (request == null) {
String errmsg = "Must pass non-null message to invoke()!";
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new NullPointerException(errmsg);
}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
index 573568d..039b559 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/NStateLatch.java
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.engine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
@@ -38,7 +38,7 @@ import java.util.concurrent.locks.ReentrantLock;
* @author Maciej Szefler ( m s z e f l e r @ g m a i l . c o m )
*/
public class NStateLatch {
- static final Log __log = LogFactory.getLog(NStateLatch.class);
+ static final Logger __log = LoggerFactory.getLogger(NStateLatch.class);
/** Current state. */
private int _state = -1;
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
index 15e532f..b136b9f 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/OutstandingRequestManager.java
@@ -29,8 +29,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -48,7 +48,7 @@ import org.apache.commons.logging.LogFactory;
public class OutstandingRequestManager implements Serializable {
private static final long serialVersionUID = -5556374398943757951L;
- private static final Log __log = LogFactory.getLog(OutstandingRequestManager.class);
+ private static final Logger __log = LoggerFactory.getLogger(OutstandingRequestManager.class);
public final Map<RequestIdTuple, Entry> _byRid = new HashMap<RequestIdTuple, Entry>();
public final Map<String, Entry> _byChannel = new HashMap<String, Entry>();
@@ -88,7 +88,7 @@ public class OutstandingRequestManager implements Serializable {
if (_byChannel.containsKey(pickResponseChannel)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
@@ -101,7 +101,7 @@ public class OutstandingRequestManager implements Serializable {
final RequestIdTuple rid = new RequestIdTuple(selectors[i].plinkInstance,selectors[i].opName, selectors[i].messageExchangeId);
if (_byRid.containsKey(rid)) {
String errmsg = "INTERNAL ERROR: Duplicate ENTRY for RID " + rid;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalStateException(errmsg);
}
_byRid.put(rid, entry);
@@ -143,7 +143,7 @@ public class OutstandingRequestManager implements Serializable {
Entry entry = _byChannel.get(pickResponseChannel);
if (entry == null) {
String errmsg = "INTERNAL ERROR: No ENTRY for RESPONSE CHANNEL " + pickResponseChannel;
- __log.fatal(errmsg);
+ __log.error(errmsg);
throw new IllegalArgumentException(errmsg);
}
http://git-wip-us.apache.org/repos/asf/ode/blob/5e73553c/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
index 1799c3b..de63dc6 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
@@ -27,8 +27,8 @@ import javax.wsdl.Operation;
import javax.wsdl.PortType;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
@@ -60,7 +60,7 @@ import org.w3c.dom.Element;
* @author Matthieu Riou <mriou at apache dot org>
*/
public class PartnerLinkMyRoleImpl extends PartnerLinkRoleImpl {
- private static final Log __log = LogFactory.getLog(BpelProcess.class);
+ private static final Logger __log = LoggerFactory.getLogger(BpelProcess.class);
private static final Messages __msgs = MessageBundle.getMessages(Messages.class);
/** The local endpoint for this "myrole". */