You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2011/02/04 10:05:55 UTC
svn commit: r1067118 [3/7] - in /servicemix/components/trunk: ./
bindings/servicemix-cxf-bc/ bindings/servicemix-file/
bindings/servicemix-file/src/main/java/org/apache/servicemix/file/
bindings/servicemix-file/src/test/java/org/apache/servicemix/file/...
Modified: servicemix/components/trunk/bindings/servicemix-vfs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-vfs/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-vfs/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-vfs/pom.xml Fri Feb 4 09:05:47 2011
@@ -85,11 +85,7 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
Modified: servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java Fri Feb 4 09:05:47 2011
@@ -33,8 +33,6 @@ import javax.jbi.messaging.NormalizedMes
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSelector;
@@ -48,6 +46,8 @@ import org.apache.servicemix.common.lock
import org.apache.servicemix.components.util.DefaultFileMarshaler;
import org.apache.servicemix.components.util.FileMarshaler;
import org.apache.servicemix.executors.ExecutorAwareRunnable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A polling endpoint that looks for a file or files in a virtual file system
@@ -63,7 +63,8 @@ import org.apache.servicemix.executors.E
* @author lhein
*/
public class VFSPollingEndpoint extends PollingEndpoint implements VFSEndpointType {
- private static final Log logger = LogFactory.getLog(VFSPollingEndpoint.class);
+
+ private final Logger logger = LoggerFactory.getLogger(VFSPollingEndpoint.class);
private FileMarshaler marshaler = new DefaultFileMarshaler();
private FileObject file;
@@ -216,7 +217,7 @@ public class VFSPollingEndpoint extends
lock.unlock();
} catch (Exception ex) {
// can't release the lock
- logger.error(ex);
+ logger.error("", ex);
}
}
}
Modified: servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java Fri Feb 4 09:05:47 2011
@@ -23,14 +23,14 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemManager;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.components.util.DefaultFileMarshaler;
import org.apache.servicemix.components.util.FileMarshaler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An endpoint which receives messages from the NMR and writes the message to
@@ -41,7 +41,8 @@ import org.apache.servicemix.components.
* @author lhein
*/
public class VFSSendingEndpoint extends ProviderEndpoint implements VFSEndpointType {
- private static final Log logger = LogFactory.getLog(VFSSendingEndpoint.class);
+
+ private final Logger logger = LoggerFactory.getLogger(VFSSendingEndpoint.class);
private FileObject file;
private FileMarshaler marshaler = new DefaultFileMarshaler();
Modified: servicemix/components/trunk/bindings/servicemix-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-xmpp/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-xmpp/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-xmpp/pom.xml Fri Feb 4 09:05:47 2011
@@ -62,10 +62,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
Modified: servicemix/components/trunk/engines/servicemix-bean/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-bean/pom.xml Fri Feb 4 09:05:47 2011
@@ -83,11 +83,6 @@
<!-- provided -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
@@ -102,16 +97,6 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- test -->
<dependency>
@@ -143,6 +128,11 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- documentation -->
<dependency>
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java Fri Feb 4 09:05:47 2011
@@ -26,37 +26,37 @@ import javax.jbi.messaging.ExchangeStatu
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
import org.apache.servicemix.bean.support.BeanSupport;
import org.apache.servicemix.jbi.listener.MessageExchangeListener;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.common.util.MessageUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* A simple tracing component which can be placed inside a pipeline
* to trace the message exchange though the component.
- * If an InOut exchange is received by this component, it will log the
+ * If an InOut exchange is received by this component, it will logger the
* input message and copy it to the output message.
*
* @version $Revision: 648504 $
*/
public class LoggingPojo extends BeanSupport implements MessageExchangeListener {
- private Log log = LogFactory.getLog(LoggingPojo.class);
+ private Logger logger = LoggerFactory.getLogger(LoggingPojo.class);
private final SourceTransformer sourceTransformer = new SourceTransformer();
private int maxMsgDisplaySize = 1500;
- public Log getLog() {
- return log;
+ public Logger getLog() {
+ return logger;
}
- public void setLog(Log log) {
- this.log = log;
+ public void setLog(Logger log) {
+ this.logger = log;
}
public int getMaxMsgDisplaySize() {
@@ -111,7 +111,7 @@ public class LoggingPojo extends BeanSup
sb.append(" ]").append('\n');
}
display(exchange, "in", sb);
- log.info("Exchange received " + sb.toString());
+ logger.info("Exchange received " + sb.toString());
if (exchange instanceof InOut) {
MessageUtil.transferInToOut(exchange, exchange);
send(exchange);
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java Fri Feb 4 09:05:47 2011
@@ -28,8 +28,6 @@ import javax.jbi.messaging.NormalizedMes
import javax.xml.namespace.QName;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.bean.Content;
import org.apache.servicemix.bean.Operation;
import org.apache.servicemix.bean.Property;
@@ -40,6 +38,8 @@ import org.apache.servicemix.expression.
import org.apache.servicemix.jbi.helper.MessageHelper;
import org.apache.servicemix.jbi.jaxp.DefaultNamespaceContext;
import org.apache.servicemix.jbi.marshaler.PojoMarshaler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents the metadata about a bean type created via a combination of
@@ -49,7 +49,7 @@ import org.apache.servicemix.jbi.marshal
*/
public class BeanInfo {
- private static final Log LOG = LogFactory.getLog(BeanInfo.class);
+ private final Logger logger = LoggerFactory.getLogger(BeanInfo.class);
private Class type;
private MethodInvocationStrategy strategy;
@@ -110,10 +110,7 @@ public class BeanInfo {
Expression expression = createParameterUnmarshalExpression(clazz, method,
parameterType, parameterAnnotations[i]);
if (expression == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("No expression available for method: "
- + method.toString() + " parameter: " + i + " so ignoring method");
- }
+ logger.debug("No expression available for method: " + method.toString() + " parameter: " + i + " so ignoring method");
return;
}
parameterExpressions[i] = expression;
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java Fri Feb 4 09:05:47 2011
@@ -34,8 +34,6 @@ import javax.management.ObjectName;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.jbi.exception.FaultException;
import org.apache.servicemix.jbi.exception.NoInMessageAvailableException;
@@ -49,8 +47,6 @@ import org.apache.servicemix.jbi.transfo
* @version $$
*/
public abstract class BeanSupport {
-
- protected Log logger = LogFactory.getLog(getClass());
@Resource
private ComponentContext context;
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java Fri Feb 4 09:05:47 2011
@@ -16,9 +16,8 @@
*/
package org.apache.servicemix.bean.support;
-/*
- * Copyright 2005-2006 Tim Fennell
- */
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
@@ -32,9 +31,6 @@ import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* <p>ResolverUtil is used to locate classes that are available in the/a class path and meet
* arbitrary conditions. The two most common conditions are that a class implements/extends
@@ -69,7 +65,7 @@ import org.apache.commons.logging.LogFac
*/
public class ResolverUtil<T> {
- private static final transient Log LOG = LogFactory.getLog(ResolverUtil.class);
+ private final transient Logger logger = LoggerFactory.getLogger(ResolverUtil.class);
/**
* A simple interface that specifies how to test classes to determine if they
@@ -215,7 +211,7 @@ public class ResolverUtil<T> {
try {
urls = loader.getResources(packageName);
} catch (IOException ioe) {
- LOG.warn("Could not read package: " + packageName, ioe);
+ logger.warn("Could not read package: " + packageName, ioe);
return;
}
while (urls.hasMoreElements()) {
@@ -230,7 +226,7 @@ public class ResolverUtil<T> {
if (urlPath.indexOf('!') > 0) {
urlPath = urlPath.substring(0, urlPath.indexOf('!'));
}
- LOG.info("Scanning for classes in [" + urlPath + "] matching criteria: " + test);
+ logger.info("Scanning for classes in [" + urlPath + "] matching criteria: " + test);
File file = new File(urlPath);
if (file.isDirectory()) {
loadImplementationsInDirectory(test, packageName, file);
@@ -238,7 +234,7 @@ public class ResolverUtil<T> {
loadImplementationsInJar(test, packageName, file);
}
} catch (IOException ioe) {
- LOG.warn("could not read entries", ioe);
+ logger.warn("could not read entries", ioe);
}
}
}
@@ -291,7 +287,7 @@ public class ResolverUtil<T> {
}
}
} catch (IOException ioe) {
- LOG.error("Could not search jar file '" + jarfile + "' for classes matching criteria: "
+ logger.error("Could not search jar file '" + jarfile + "' for classes matching criteria: "
+ test + "due to an IOException: " + ioe.getMessage());
}
}
@@ -307,14 +303,14 @@ public class ResolverUtil<T> {
try {
String externalName = fqn.substring(0, fqn.indexOf('.')).replace('/', '.');
ClassLoader loader = getClassLoader();
- LOG.trace("Checking to see if class " + externalName + " matches criteria [" + test + "]");
+ logger.trace("Checking to see if class " + externalName + " matches criteria [" + test + "]");
Class type = loader.loadClass(externalName);
if (test.matches(type)) {
matches.add((Class<T>) type);
}
} catch (Throwable t) {
- LOG.warn("Could not examine class '" + fqn + "' due to a "
+ logger.warn("Could not examine class '" + fqn + "' due to a "
+ t.getClass().getName() + " with message: " + t.getMessage());
}
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java Fri Feb 4 09:05:47 2011
@@ -32,6 +32,8 @@ import org.apache.servicemix.jbi.transfo
import org.apache.servicemix.store.Store;
import org.apache.servicemix.store.StoreFactory;
import org.apache.servicemix.store.memory.MemoryStoreFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A useful base class for a transform component.
@@ -39,6 +41,8 @@ import org.apache.servicemix.store.memor
* @version $Revision$
*/
public abstract class TransformBeanSupport extends BeanSupport implements MessageExchangeListener {
+
+ private final Logger logger = LoggerFactory.getLogger(TransformBeanSupport.class);
private String correlation;
@@ -199,9 +203,7 @@ public abstract class TransformBeanSuppo
fail(exchange, e);
} catch (Exception e2) {
logger.warn("Unable to handle error: " + e2, e2);
- if (logger.isDebugEnabled()) {
- logger.debug("Original error: " + e, e);
- }
+ logger.debug("Original error: " + e, e);
}
}
}
@@ -247,9 +249,7 @@ public abstract class TransformBeanSuppo
+ " but has no Out nor Fault message");
}
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Original error: " + e, e);
- }
+ logger.debug("Original error: " + e, e);
}
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java Fri Feb 4 09:05:47 2011
@@ -30,12 +30,13 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.commons.logging.impl.SimpleLog;
import org.apache.servicemix.bean.pojos.LoggingPojo;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.client.ServiceMixClientFacade;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.slf4j.Logger;
+import org.slf4j.Marker;
public class LoggingPojoTest extends TestCase {
@@ -53,12 +54,7 @@ public class LoggingPojoTest extends Tes
BeanEndpoint loggingEndpoint = new BeanEndpoint();
LoggingPojo pojo = new LoggingPojo();
pojo.setMaxMsgDisplaySize(35);
- pojo.setLog(new SimpleLog("my-logger") {
- @Override
- protected void log(int type, Object message, Throwable t) {
- messages.add(message.toString());
- }
- });
+ pojo.setLog(new MyLogger("my-logger"));
loggingEndpoint.setBean(pojo);
loggingEndpoint.setService(new QName("logging"));
loggingEndpoint.setInterfaceName(new QName("logservice"));
@@ -128,4 +124,197 @@ public class LoggingPojoTest extends Tes
assertTrue(message.contains("xml = <an>XML value</an>"));
assertTrue(message.contains("attachments:"));
}
+
+ private class MyLogger implements Logger {
+ private String name;
+
+ public MyLogger(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void debug(String message) {
+ messages.add(message);
+ }
+ public void debug(Marker marker, String format, Object args1, Object args2) {
+ messages.add(marker.toString());
+ }
+ public void debug(Marker marker, String format, Object args) {
+ messages.add(marker.toString());
+ }
+ public void debug(Marker marker, String format, Object[] args) {
+ messages.add(marker.toString());
+ }
+ public void debug(Marker marker, String format) {
+ messages.add(marker.toString());
+ }
+ public void debug(Marker marker, String format, Throwable cause) {
+ messages.add(marker.toString());
+ }
+ public void debug(String message, Object args1, Object args2) {
+ messages.add(message);
+ }
+ public void debug(String message, Throwable cause) {
+ messages.add(message);
+ }
+ public void debug(String message, Object args) {
+ messages.add(message);
+ }
+ public void debug(String message, Object[] args) {
+ messages.add(message);
+ }
+ public void trace(Marker marker, String format, Object arg1, Object arg2) {
+ messages.add(marker.toString());
+ }
+ public void trace(Marker marker, String format) {
+ messages.add(marker.toString());
+ }
+ public void trace(String message, Object args) {
+ messages.add(message);
+ }
+ public void trace(String message, Throwable cause) {
+ messages.add(message);
+ }
+ public void trace(String message, Object[] args) {
+ messages.add(message);
+ }
+ public void trace(Marker marker, String format, Throwable cause) {
+ messages.add(marker.toString());
+ }
+ public void trace(Marker marker, String format, Object[] args) {
+ messages.add(marker.toString());
+ }
+ public void trace(Marker marker, String format, Object args) {
+ messages.add(marker.toString());
+ }
+ public void trace(String message, Object args1, Object args2) {
+ messages.add(message);
+ }
+ public void trace(String message) {
+ messages.add(message);
+ }
+ public void info(String message, Throwable cause) {
+ messages.add(message);
+ }
+ public void info(Marker marker, String format, Object[] argArray) {
+ messages.add(marker.toString());
+ }
+ public void info(Marker marker, String format, Throwable cause) {
+ messages.add(marker.toString());
+ }
+ public void info(Marker marker, String format, Object args) {
+ messages.add(marker.toString());
+ }
+ public void info(String message, Object[] args) {
+ messages.add(message);
+ }
+ public void info(String message, Object args) {
+ messages.add(message);
+ }
+ public void info(String message, Object args1, Object args2) {
+ messages.add(message);
+ }
+ public void info(Marker marker, String format, Object args1, Object args2) {
+ messages.add(marker.toString());
+ }
+ public void info(Marker marker, String format) {
+ messages.add(marker.toString());
+ }
+ public void info(String message) {
+ messages.add(message);
+ }
+ public void warn(Marker marker, String format, Throwable cause) {
+ messages.add(marker.toString());
+ }
+ public void warn(Marker marker, String format, Object[] argArray) {
+ messages.add(marker.toString());
+ }
+ public void warn(String message, Object args1, Object args2) {
+ messages.add(message);
+ }
+ public void warn(String message, Object args) {
+ messages.add(message);
+ }
+ public void warn(Marker marker, String format, Object args) {
+ messages.add(marker.toString());
+ }
+ public void warn(String message, Throwable cause) {
+ messages.add(message);
+ }
+ public void warn(String message, Object[] args) {
+ messages.add(message);
+ }
+ public void warn(Marker marker, String format, Object args1, Object args2) {
+ messages.add(marker.toString());
+ }
+ public void warn(String message) {
+ messages.add(message);
+ }
+ public void warn(Marker marker, String format) {
+ messages.add(marker.toString());
+ }
+ public void error(String message, Throwable cause) {
+ messages.add(message);
+ }
+ public void error(String message, Object[] args) {
+ messages.add(message);
+ }
+ public void error(String message, Object args) {
+ messages.add(message);
+ }
+ public void error(String message) {
+ messages.add(message);
+ }
+ public void error(String message, Object args1, Object args2) {
+ messages.add(message);
+ }
+ public void error(Marker marker, String format, Throwable cause) {
+ messages.add(marker.toString());
+ }
+ public void error(Marker marker, String format, Object[] args) {
+ messages.add(marker.toString());
+ }
+ public void error(Marker marker, String format, Object args) {
+ messages.add(marker.toString());
+ }
+ public void error(Marker marker, String format) {
+ messages.add(marker.toString());
+ }
+ public void error(Marker marker, String format, Object args1, Object args2) {
+ messages.add(marker.toString());
+ }
+ public boolean isDebugEnabled(Marker marker) {
+ return true;
+ }
+ public boolean isErrorEnabled(Marker marker) {
+ return true;
+ }
+ public boolean isInfoEnabled(Marker marker) {
+ return true;
+ }
+ public boolean isTraceEnabled(Marker marker) {
+ return true;
+ }
+ public boolean isWarnEnabled(Marker marker) {
+ return true;
+ }
+ public boolean isInfoEnabled() {
+ return true;
+ }
+ public boolean isWarnEnabled() {
+ return true;
+ }
+ public boolean isErrorEnabled() {
+ return true;
+ }
+ public boolean isDebugEnabled() {
+ return true;
+ }
+ public boolean isTraceEnabled() {
+ return true;
+ }
+ }
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java Fri Feb 4 09:05:47 2011
@@ -19,16 +19,15 @@ package org.apache.servicemix.bean;
import java.net.URI;
import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: $
*/
public class UriTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(UriTest.class);
+ private final Logger logger = LoggerFactory.getLogger(UriTest.class);
public void testSimpleURI() throws Exception {
URI uri = new URI("bean:cheese");
@@ -62,21 +61,21 @@ public class UriTest extends TestCase {
}
protected void dump(URI uri) {
- LOG.info("URI: " + uri);
- LOG.info("getAuthority(): " + uri.getAuthority());
- LOG.info("getFragment(): " + uri.getFragment());
- LOG.info("getHost(): " + uri.getHost());
- LOG.info("getPath(): " + uri.getPath());
- LOG.info("getPort(): " + uri.getPort());
- LOG.info("getQuery(): " + uri.getQuery());
- LOG.info("getRawAuthority(): " + uri.getRawAuthority());
- LOG.info("getRawFragment(): " + uri.getRawFragment());
- LOG.info("getRawPath(): " + uri.getRawPath());
- LOG.info("getRawQuery(): " + uri.getRawQuery());
- LOG.info("getRawSchemeSpecificPart(): " + uri.getRawSchemeSpecificPart());
- LOG.info("getRawUserInfo(): " + uri.getRawUserInfo());
- LOG.info("getScheme(): " + uri.getScheme());
- LOG.info("getSchemeSpecificPart(): " + uri.getSchemeSpecificPart());
- LOG.info("getUserInfo(): " + uri.getUserInfo());
+ logger.info("URI: " + uri);
+ logger.info("getAuthority(): " + uri.getAuthority());
+ logger.info("getFragment(): " + uri.getFragment());
+ logger.info("getHost(): " + uri.getHost());
+ logger.info("getPath(): " + uri.getPath());
+ logger.info("getPort(): " + uri.getPort());
+ logger.info("getQuery(): " + uri.getQuery());
+ logger.info("getRawAuthority(): " + uri.getRawAuthority());
+ logger.info("getRawFragment(): " + uri.getRawFragment());
+ logger.info("getRawPath(): " + uri.getRawPath());
+ logger.info("getRawQuery(): " + uri.getRawQuery());
+ logger.info("getRawSchemeSpecificPart(): " + uri.getRawSchemeSpecificPart());
+ logger.info("getRawUserInfo(): " + uri.getRawUserInfo());
+ logger.info("getScheme(): " + uri.getScheme());
+ logger.info("getSchemeSpecificPart(): " + uri.getSchemeSpecificPart());
+ logger.info("getUserInfo(): " + uri.getUserInfo());
}
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java Fri Feb 4 09:05:47 2011
@@ -18,9 +18,9 @@ package org.apache.servicemix.bean.beans
import javax.jbi.messaging.MessageExchange;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.bean.Operation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A simple POJO which uses an annotation to indicate which method should be driven by a message exchange
@@ -29,7 +29,7 @@ import org.apache.servicemix.bean.Operat
*/
public class AnnotatedBean {
- private static final Log LOG = LogFactory.getLog(AnnotatedBean.class);
+ private final Logger logger = LoggerFactory.getLogger(AnnotatedBean.class);
private MessageExchange myExchangeMethod;
@@ -37,7 +37,7 @@ public class AnnotatedBean {
public void myExchangeMethod(MessageExchange messageExchange) {
this.myExchangeMethod = messageExchange;
- LOG.info("myExchangeMethod() received exchange: " + messageExchange);
+ logger.info("myExchangeMethod() received exchange: " + messageExchange);
}
public MessageExchange getMyExchangeMethod() {
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java Fri Feb 4 09:05:47 2011
@@ -18,9 +18,9 @@ package org.apache.servicemix.bean.beans
import javax.jbi.messaging.MessageExchange;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.bean.Endpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A simple POJO which uses annotations to expose it on a JBI bus
@@ -30,13 +30,13 @@ import org.apache.servicemix.bean.Endpoi
@Endpoint(name = "cheese", targetNamespace = "urn:test", serviceName = "service")
public class AutoDeployedBean {
- private static final Log LOG = LogFactory.getLog(AutoDeployedBean.class);
+ private final Logger logger = LoggerFactory.getLogger(AutoDeployedBean.class);
public void foo(MessageExchange messageExchange) {
- LOG.info("foo() called with exchange: " + messageExchange);
+ logger.info("foo() called with exchange: " + messageExchange);
}
public void bar(MessageExchange messageExchange) {
- LOG.info("bar() called with exchange: " + messageExchange);
+ logger.info("bar() called with exchange: " + messageExchange);
}
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java Fri Feb 4 09:05:47 2011
@@ -23,10 +23,10 @@ import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.jbi.listener.MessageExchangeListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A simple POJO which implements the {@link MessageExchangeListener} interface
@@ -35,7 +35,7 @@ import org.apache.servicemix.jbi.listene
*/
public class ListenerBean implements MessageExchangeListener {
- private static final Log LOG = LogFactory.getLog(ListenerBean.class);
+ private final Logger logger = LoggerFactory.getLogger(ListenerBean.class);
@Resource
private DeliveryChannel channel;
@@ -45,7 +45,7 @@ public class ListenerBean implements Mes
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
this.lastExchange = exchange;
- LOG.info("Received exchange: " + exchange);
+ logger.info("Received exchange: " + exchange);
if (exchange instanceof InOnly) {
exchange.setStatus(ExchangeStatus.DONE);
channel.send(exchange);
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java Fri Feb 4 09:05:47 2011
@@ -18,11 +18,11 @@ package org.apache.servicemix.bean.beans
import javax.jbi.messaging.MessageExchange;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.bean.Content;
import org.apache.servicemix.bean.Property;
import org.apache.servicemix.bean.XPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A simple POJO which uses no annotations
@@ -31,7 +31,7 @@ import org.apache.servicemix.bean.XPath;
*/
public class PlainBean {
- private static final Log LOG = LogFactory.getLog(PlainBean.class);
+ private final Logger logger = LoggerFactory.getLogger(PlainBean.class);
private MessageExchange foo;
private MessageExchange bar;
@@ -41,30 +41,30 @@ public class PlainBean {
public void foo(MessageExchange messageExchange) {
this.foo = messageExchange;
- LOG.info("foo() called with exchange: " + messageExchange);
+ logger.info("foo() called with exchange: " + messageExchange);
}
public void bar(MessageExchange messageExchange) {
this.bar = messageExchange;
- LOG.info("bar() called with exchange: " + messageExchange);
+ logger.info("bar() called with exchange: " + messageExchange);
}
public void methodWithPropertyParameter(@Property(name = "person") String name) {
this.propertyParameter = name;
- LOG.info("methodWithPropertyParameter() called with parameter: " + name);
+ logger.info("methodWithPropertyParameter() called with parameter: " + name);
}
public void methodWithPropertyParameterAndXPath(@Property(name = "person") String name,
@XPath(xpath = "/hello/@address") String address) {
this.propertyParameter = name;
this.xpathParameter = address;
- LOG.info("methodWithPropertyParameterAndXPath() called with parameter: " + address);
+ logger.info("methodWithPropertyParameterAndXPath() called with parameter: " + address);
}
public void methodWithPropertyParameterAndContent(@Property(name = "person") String name, @Content Object content) {
this.propertyParameter = name;
this.body = content;
- LOG.info("methodWithPropertyParameterAndContent() called with body: " + content);
+ logger.info("methodWithPropertyParameterAndContent() called with body: " + content);
}
Modified: servicemix/components/trunk/engines/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-camel/pom.xml Fri Feb 4 09:05:47 2011
@@ -72,10 +72,6 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java Fri Feb 4 09:05:47 2011
@@ -38,14 +38,14 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.camel.util.BasicSerializationHeaderFilterStrategy;
import org.apache.servicemix.camel.util.HeaderFilterStrategies;
import org.apache.servicemix.camel.util.HeaderFilterStrategyConstants;
import org.apache.servicemix.camel.util.NoCheckSerializationHeaderFilterStrategy;
import org.apache.servicemix.camel.util.StrictSerializationHeaderFilterStrategy;
import org.apache.servicemix.jbi.exception.FaultException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The binding of how Camel messages get mapped to JBI and back again
@@ -58,7 +58,7 @@ public class JbiBinding {
public static final String OPERATION = "JbiOperation";
public static final String SECURITY_SUBJECT = "JbiSecuritySubject";
- private static final Log LOG = LogFactory.getLog(JbiBinding.class);
+ private final Logger logger = LoggerFactory.getLogger(JbiBinding.class);
private final CamelContext context;
@@ -108,9 +108,7 @@ public class JbiBinding {
try {
ClassLoader loader = context.getApplicationContextClassLoader();
if (loader != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Set the thread context classloader " + loader);
- }
+ logger.debug("Set the thread context classloader " + loader);
Thread.currentThread().setContextClassLoader(loader);
}
return callable.call();
@@ -238,7 +236,7 @@ public class JbiBinding {
public void copyFromCamelToJbi(Message message, NormalizedMessage normalizedMessage) throws MessagingException {
if (message != null && message.getBody() != null) {
if (message.getBody(Source.class) == null) {
- LOG.warn("Unable to convert message body of type " + message.getBody().getClass() + " into an XML Source");
+ logger.warn("Unable to convert message body of type " + message.getBody().getClass() + " into an XML Source");
} else {
normalizedMessage.setContent(message.getBody(Source.class));
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java Fri Feb 4 09:05:47 2011
@@ -30,10 +30,9 @@ import org.apache.camel.impl.converter.A
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.spi.Registry;
-import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.URISupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
/**
@@ -81,7 +80,7 @@ public class JbiEndpoint extends Default
protected class JbiProducer extends DefaultProducer implements AsyncProcessor {
- private final Log log = LogFactory.getLog(JbiProducer.class);
+ private final Logger logger = LoggerFactory.getLogger(JbiProducer.class);
private CamelConsumerEndpoint consumer;
@@ -99,9 +98,9 @@ public class JbiEndpoint extends Default
@Override
public void stop() throws Exception {
if (isStopped()) {
- log.debug("Camel producer for " + super.getEndpoint() + " has already been stopped");
+ logger.debug("Camel producer for " + super.getEndpoint() + " has already been stopped");
} else {
- log.debug("Stopping Camel producer for " + super.getEndpoint());
+ logger.debug("Stopping Camel producer for " + super.getEndpoint());
jbiComponent.getCamelJbiComponent().removeEndpoint(consumer);
super.stop();
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java Fri Feb 4 09:05:47 2011
@@ -22,8 +22,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.camel.CamelJbiComponent;
import org.apache.servicemix.camel.CamelSpringDeployer;
import org.apache.servicemix.common.BaseServiceUnitManager;
@@ -35,6 +33,8 @@ import org.apache.xbean.classloader.JarF
import org.apache.xbean.spring.context.SpringApplicationContext;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -54,7 +54,8 @@ import org.springframework.osgi.util.Bun
*/
public class OsgiCamelJbiComponent extends CamelJbiComponent {
- private static final Log LOG = LogFactory.getLog(OsgiCamelJbiComponent.class);
+ private final Logger logger = LoggerFactory.getLogger(OsgiCamelJbiComponent.class);
+
private BundleContext bundleContext;
private long shutdownTimeout;
@@ -111,7 +112,7 @@ public class OsgiCamelJbiComponent exten
if (bean instanceof BundleContextAware) {
BundleContextAware bundleContextAware = (BundleContextAware)bean;
if (bundleContext == null) {
- LOG.warn("No bundle defined yet so cannot inject into: " + bean);
+ logger.warn("No bundle defined yet so cannot inject into: " + bean);
} else {
bundleContextAware.setBundleContext(bundleContext);
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java Fri Feb 4 09:05:47 2011
@@ -23,8 +23,8 @@ import java.io.Serializable;
import org.apache.camel.Exchange;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link org.apache.camel.spi.HeaderFilterStrategy} that filters out non-serializable values.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
*/
public class StrictSerializationHeaderFilterStrategy implements HeaderFilterStrategy {
- private static final Log LOG = LogFactory.getLog(StrictSerializationHeaderFilterStrategy.class);
+ private final Logger logger = LoggerFactory.getLogger(StrictSerializationHeaderFilterStrategy.class);
public boolean applyFilterToCamelHeaders(String s, Object o, Exchange exchange) {
return doApplyFilter(s, o);
@@ -51,8 +51,7 @@ public class StrictSerializationHeaderFi
oos = new ObjectOutputStream(new ByteArrayOutputStream());
oos.writeObject(o);
} catch (IOException e) {
- LOG.debug(String.format("%s implements Serializable, but serialization throws IOException: filtering key %s",
- o, s));
+ logger.debug(String.format("%s implements Serializable, but serialization throws IOException: filtering key %s", o, s));
return true;
} finally {
if (oos != null) {
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java Fri Feb 4 09:05:47 2011
@@ -23,17 +23,18 @@ import java.util.Collection;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.common.ServiceUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Test cases to ensure that {@link org.apache.servicemix.camel.CamelContextEndpoint} correctly
* manages the lifecycle of the underlying {@link org.apache.camel.CamelContext}
*/
public class CamelContextEndpointLifeCycleTest extends NonJbiCamelEndpointsIntegrationTest {
- private static final transient Log LOG = LogFactory.getLog(CamelContextEndpointLifeCycleTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(CamelContextEndpointLifeCycleTest.class);
public void testComponentInstallation() throws Exception {
String serviceUnitConfiguration = suName + "-src/camel-context.xml";
@@ -69,7 +70,7 @@ public class CamelContextEndpointLifeCyc
component.getServiceUnitManager().shutDown(suName);
component.getServiceUnitManager().undeploy(suName, path.getAbsolutePath());
} catch (Exception e) {
- LOG.error("Caught: " + e, e);
+ logger.error("Caught: " + e, e);
throw e;
}
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java Fri Feb 4 09:05:47 2011
@@ -21,13 +21,13 @@ import javax.jbi.messaging.MessagingExce
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.EchoComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MyEchoComponent extends EchoComponent {
- private static final Log LOG = LogFactory.getLog(MyEchoComponent.class);
+ private final Logger logger = LoggerFactory.getLogger(MyEchoComponent.class);
public MyEchoComponent() {
}
@@ -42,7 +42,7 @@ public class MyEchoComponent extends Ech
if (exchange.getOperation() != null) {
out.setProperty("operation", exchange.getOperation());
}
- LOG.info("Echoed back message: " + out);
+ logger.info("Echoed back message: " + out);
return true;
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java Fri Feb 4 09:05:47 2011
@@ -28,19 +28,19 @@ import javax.jbi.servicedesc.ServiceEndp
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1 $
*/
public class NonJbiCamelEndpointsIntegrationTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(NonJbiCamelEndpointsIntegrationTest.class);
+ private final static Logger logger = LoggerFactory.getLogger(NonJbiCamelEndpointsIntegrationTest.class);
protected String suName = "su1";
@@ -60,7 +60,7 @@ public class NonJbiCamelEndpointsIntegra
try {
for (int i = 0; i < 2; i++) {
- LOG.info("Loop counter: " + i);
+ logger.info("Loop counter: " + i);
// Deploy and start su
component.getServiceUnitManager().deploy(suName,
@@ -93,13 +93,11 @@ public class NonJbiCamelEndpointsIntegra
client.send(exchange);
fail("Should have failed to send to a no longer deployed component");
} catch (Throwable e) {
- LOG.debug(
- "Caught expected exception as the component is undeployed: "
- + e, e);
+ logger.debug("Caught expected exception as the component is undeployed: " + e, e);
}
}
} catch (Exception e) {
- LOG.error("Caught: " + e, e);
+ logger.error("Caught: " + e, e);
throw e;
}
}
@@ -122,7 +120,7 @@ public class NonJbiCamelEndpointsIntegra
fail("Unable to create temporary working root directory ["
+ tempTemp.getAbsolutePath() + "]");
}
- LOG.info("Using temporary root directory ["
+ logger.info("Using temporary root directory ["
+ tempRootDir.getAbsolutePath() + "]");
container.setEmbedded(true);
@@ -167,7 +165,7 @@ public class NonJbiCamelEndpointsIntegra
}
public static boolean deleteDir(File dir) {
- LOG.info("Deleting directory : " + dir.getAbsolutePath());
+ logger.info("Deleting directory : " + dir.getAbsolutePath());
if (dir.isDirectory()) {
String[] children = dir.list();
for (int i = 0; i < children.length; i++) {
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java Fri Feb 4 09:05:47 2011
@@ -21,17 +21,17 @@ import java.net.URI;
import java.net.URL;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Enhances {@link JbiTestSupport} to enable SU deployment as well
*/
public abstract class SpringJbiTestSupport extends JbiTestSupport {
- private static final Log LOG = LogFactory.getLog(SpringJbiTestSupport.class);
+ private final Logger logger = LoggerFactory.getLogger(SpringJbiTestSupport.class);
private File tempRootDir;
@@ -60,7 +60,7 @@ public abstract class SpringJbiTestSuppo
if (!tempTemp.mkdirs()) {
fail("Unable to create temporary working root directory [" + tempTemp.getAbsolutePath() + "]");
}
- LOG.info("Using temporary root directory [" + tempRootDir.getAbsolutePath() + "]");
+ logger.info("Using temporary root directory [" + tempRootDir.getAbsolutePath() + "]");
jbiContainer.setRootDir(tempRootDir.getAbsolutePath());
jbiContainer.setEmbedded(true);
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TwoServicemixCamelSusTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TwoServicemixCamelSusTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TwoServicemixCamelSusTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/TwoServicemixCamelSusTest.java Fri Feb 4 09:05:47 2011
@@ -21,12 +21,12 @@ import java.net.URI;
import java.net.URL;
import org.apache.camel.CamelContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TwoServicemixCamelSusTest extends NonJbiCamelEndpointsIntegrationTest {
- private static final transient Log LOG = LogFactory.getLog(TwoServicemixCamelSusTest.class);
+ private final Logger logger = LoggerFactory.getLogger(TwoServicemixCamelSusTest.class);
private void deploySu(CamelJbiComponent component, String suName) throws Exception {
String serviceUnitConfiguration = suName + "-src/camel-context.xml";
Modified: servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml Fri Feb 4 09:05:47 2011
@@ -76,10 +76,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-jbi</artifactId>
<version>${cxf.version}</version>
Modified: servicemix/components/trunk/engines/servicemix-drools/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-drools/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-drools/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-drools/pom.xml Fri Feb 4 09:05:47 2011
@@ -72,10 +72,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared</artifactId>
</dependency>
Modified: servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/JbiHelper.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/JbiHelper.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/JbiHelper.java (original)
+++ servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/JbiHelper.java Fri Feb 4 09:05:47 2011
@@ -25,8 +25,6 @@ import javax.jbi.messaging.MessagingExce
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.transform.Source;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.EndpointSupport;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.util.MessageUtil;
@@ -37,6 +35,8 @@ import org.apache.servicemix.jbi.jaxp.So
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A helper class for use inside a rule to forward a message to an endpoint
@@ -74,8 +74,8 @@ public class JbiHelper {
return exchange;
}
- public Log getLogger() {
- return LogFactory.getLog(memory.getRuleBase().getPackages()[0].getName());
+ public Logger getLogger() {
+ return LoggerFactory.getLogger(memory.getRuleBase().getPackages()[0].getName());
}
/**
Modified: servicemix/components/trunk/engines/servicemix-drools/src/test/resources/chained.drl
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-drools/src/test/resources/chained.drl?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-drools/src/test/resources/chained.drl (original)
+++ servicemix/components/trunk/engines/servicemix-drools/src/test/resources/chained.drl Fri Feb 4 09:05:47 2011
@@ -1,8 +1,5 @@
package org.apache.servicemix.drools
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.servicemix.drools.model.Exchange;
global org.apache.servicemix.drools.model.JbiHelper jbi;
Modified: servicemix/components/trunk/engines/servicemix-drools/src/test/resources/fibonacci.drl
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-drools/src/test/resources/fibonacci.drl?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-drools/src/test/resources/fibonacci.drl (original)
+++ servicemix/components/trunk/engines/servicemix-drools/src/test/resources/fibonacci.drl Fri Feb 4 09:05:47 2011
@@ -16,8 +16,6 @@
*/
package org.apache.servicemix.drools
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.drools.model.Exchange;
import org.apache.servicemix.drools.fibonacci.Fibonacci;
import org.apache.servicemix.drools.fibonacci.Request;
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java Fri Feb 4 09:05:47 2011
@@ -27,8 +27,6 @@ import javax.jbi.messaging.MessagingExce
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
@@ -36,6 +34,8 @@ import org.apache.servicemix.expression.
import org.apache.servicemix.expression.PropertyExpression;
import org.apache.servicemix.timers.Timer;
import org.apache.servicemix.timers.TimerListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The async bridge pattern is used to bridge an In-Out exchange with two In-Only
@@ -58,7 +58,7 @@ public class AsyncBridge extends EIPEndp
public static final String CORRID = "org.apache.servicemix.eip.asyncbridge.corrid";
- private static final Log LOG = LogFactory.getLog(AsyncBridge.class);
+ private final Logger logger = LoggerFactory.getLogger(AsyncBridge.class);
private Expression requestCorrId = new Expression() {
public Object evaluate(MessageExchange exchange, NormalizedMessage message) throws MessagingException {
@@ -320,7 +320,7 @@ public class AsyncBridge extends EIPEndp
fail(t0, new TimeoutException());
}
} catch (Exception e) {
- LOG.debug("Exception caught when handling timeout", e);
+ logger.debug("Exception caught when handling timeout", e);
}
}
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java Fri Feb 4 09:05:47 2011
@@ -25,12 +25,11 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.eip.EIPEndpoint;
-import org.apache.servicemix.eip.support.AbstractAggregator;
import org.apache.servicemix.eip.support.ExchangeTarget;
import org.apache.servicemix.common.util.MessageUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The StaticRecipientList component will forward an input In-Only or Robust-In-Only
@@ -45,7 +44,7 @@ import org.apache.servicemix.common.util
*/
public class StaticRecipientList extends EIPEndpoint {
- private static final Log LOG = LogFactory.getLog(StaticRecipientList.class);
+ private final Logger logger = LoggerFactory.getLogger(StaticRecipientList.class);
public static final String RECIPIENT_LIST_COUNT = "org.apache.servicemix.eip.recipientList.count";
public static final String RECIPIENT_LIST_INDEX = "org.apache.servicemix.eip.recipientList.index";
@@ -213,7 +212,7 @@ public class StaticRecipientList extends
try {
lock.unlock();
} catch (Exception ex) {
- LOG.info("Caught exception while attempting to release lock", ex);
+ logger.info("Caught exception while attempting to release lock", ex);
}
if (removeLock) {
lockManager.removeLock(corrId);
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java Fri Feb 4 09:05:47 2011
@@ -30,8 +30,6 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.eip.EIPEndpoint;
@@ -41,6 +39,8 @@ import org.apache.servicemix.store.memor
import org.apache.servicemix.store.memory.MemoryStoreFactory;
import org.apache.servicemix.timers.Timer;
import org.apache.servicemix.timers.TimerListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Aggregator can be used to wait and combine several messages.
@@ -59,7 +59,7 @@ import org.apache.servicemix.timers.Time
*/
public abstract class AbstractAggregator extends EIPEndpoint {
- private static final Log LOG = LogFactory.getLog(AbstractAggregator.class);
+ private final Logger logger = LoggerFactory.getLogger(AbstractAggregator.class);
private ExchangeTarget target;
@@ -343,8 +343,8 @@ public abstract class AbstractAggregator
} else {
store.store(correlationId, aggregation);
if (timeout != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Scheduling timeout at " + timeout + " for aggregate " + correlationId);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Scheduling timeout at " + timeout + " for aggregate " + correlationId);
}
Timer t = getTimerManager().schedule(new TimerListener() {
public void timerExpired(Timer timer) {
@@ -369,7 +369,7 @@ public abstract class AbstractAggregator
try {
lock.unlock();
} catch (Exception ex) {
- LOG.info("Caught exception while attempting to release aggregation lock", ex);
+ logger.info("Caught exception while attempting to release aggregation lock", ex);
}
if (removeLock) {
lockManager.removeLock(correlationId);
@@ -400,9 +400,7 @@ public abstract class AbstractAggregator
}
protected void onTimeout(String processCorrelationId, String correlationId, Timer timer) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Timeout expired for aggregate " + correlationId);
- }
+ logger.debug("Timeout expired for aggregate " + correlationId);
Lock lock = getLockManager().getLock(correlationId);
lock.lock();
try {
@@ -431,17 +429,15 @@ public abstract class AbstractAggregator
} else if (!isAggregationClosed(correlationId)) {
throw new IllegalStateException("Aggregation is not closed, but can not be retrieved from the store");
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Aggregate " + correlationId + " is closed");
- }
+ logger.debug("Aggregate " + correlationId + " is closed");
}
} catch (Exception e) {
- LOG.info("Caught exception while processing timeout aggregation", e);
+ logger.info("Caught exception while processing timeout aggregation", e);
} finally {
try {
lock.unlock();
} catch (Exception ex) {
- LOG.info("Caught exception while attempting to release timeout aggregation lock", ex);
+ logger.info("Caught exception while attempting to release timeout aggregation lock", ex);
}
lockManager.removeLock(correlationId);
}
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java Fri Feb 4 09:05:47 2011
@@ -29,10 +29,10 @@ import javax.jbi.messaging.NormalizedMes
import javax.jbi.messaging.RobustInOnly;
import javax.xml.transform.Source;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.common.util.MessageUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The AbstractSplitter is an abstract base class for Splitters.
@@ -49,7 +49,7 @@ public abstract class AbstractSplitter e
public static final String SPLITTER_INDEX = "org.apache.servicemix.eip.splitter.index";
public static final String SPLITTER_CORRID = "org.apache.servicemix.eip.splitter.corrid";
- private static final Log LOG = LogFactory.getLog(AbstractSplitter.class);
+ private final Logger logger = LoggerFactory.getLogger(AbstractSplitter.class);
/**
* The address of the target endpoint
*/
@@ -292,7 +292,7 @@ public abstract class AbstractSplitter e
try {
lock.unlock();
} catch (Exception ex) {
- LOG.info("Caught exception while attempting to release lock", ex);
+ logger.info("Caught exception while attempting to release lock", ex);
}
if (removeLock) {
lockManager.removeLock(corrId);
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/SwitchPredicate.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/SwitchPredicate.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/SwitchPredicate.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/SwitchPredicate.java Fri Feb 4 09:05:47 2011
@@ -21,14 +21,12 @@ import java.io.IOException;
import java.util.Properties;
import javax.jbi.messaging.MessageExchange;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
-
-
/**
* Switch (on/off) predicate based on a property that can come from
* a system property, a property from a property file (specified as Spring resource),
@@ -40,7 +38,7 @@ import org.springframework.core.io.Resou
*/
public class SwitchPredicate implements InitializingBean, Predicate {
- private static Log log = LogFactory.getLog(SwitchPredicate.class);
+ private final Logger logger = LoggerFactory.getLogger(SwitchPredicate.class);
// property resource optionally
private Resource propertyResource;
@@ -63,8 +61,8 @@ public class SwitchPredicate implements
if (propertyResource != null && propertyResource.exists()) {
// get property from properties file
propertyFile = propertyResource.getFile();
- if (log.isDebugEnabled()) {
- log.debug("loading property file: " + propertyFile.getAbsolutePath());
+ if (logger.isDebugEnabled()) {
+ logger.debug("loading property file: " + propertyFile.getAbsolutePath());
}
props = new Properties();
props.load(propertyResource.getInputStream());
@@ -77,7 +75,7 @@ public class SwitchPredicate implements
on = Boolean.valueOf(value);
}
} catch (IOException e) {
- log.error("could not load switch property file - filter is off", e);
+ logger.error("could not load switch property file - filter is off", e);
on = Boolean.FALSE;
}
dirty = false;
@@ -172,7 +170,7 @@ public class SwitchPredicate implements
match = Boolean.valueOf(value.toString());
}
} catch (Exception e) {
- log.warn("Could not evaluate xpath expression", e);
+ logger.warn("Could not evaluate xpath expression", e);
match = Boolean.FALSE;
}
} else {
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/XPathPredicate.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/XPathPredicate.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/XPathPredicate.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/XPathPredicate.java Fri Feb 4 09:05:47 2011
@@ -22,11 +22,11 @@ import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathFunctionResolver;
import javax.xml.namespace.NamespaceContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.expression.JAXPBooleanXPathExpression;
import org.apache.servicemix.expression.MessageVariableResolver;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A predicate that verify if the xpath expression evaluated on
@@ -38,7 +38,7 @@ import org.apache.servicemix.jbi.jaxp.So
*/
public class XPathPredicate extends JAXPBooleanXPathExpression implements Predicate {
- private static final Log LOG = LogFactory.getLog(XPathPredicate.class);
+ private final Logger logger = LoggerFactory.getLogger(XPathPredicate.class);
public XPathPredicate() {
}
@@ -56,7 +56,7 @@ public class XPathPredicate extends JAXP
Boolean match = (Boolean) evaluate(exchange, in);
return Boolean.TRUE.equals(match);
} catch (Exception e) {
- LOG.warn("Could not evaluate xpath expression", e);
+ logger.warn("Could not evaluate xpath expression", e);
return false;
}
}
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerEngine.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerEngine.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerEngine.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerEngine.java Fri Feb 4 09:05:47 2011
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.eip.support.resequence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Queue;
import java.util.Timer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Resequences elements based on a given {@link SequenceElementComparator}.
* This resequencer is designed for resequencing element streams. Resequenced
@@ -63,7 +63,7 @@ import org.apache.commons.logging.LogFac
*/
public class ResequencerEngine<E> implements TimeoutHandler {
- private static final Log LOG = LogFactory.getLog(ResequencerEngine.class);
+ private final Logger logger = LoggerFactory.getLogger(ResequencerEngine.class);
private long timeout;
@@ -162,7 +162,7 @@ public class ResequencerEngine<E> implem
// work done in deliver()
}
} catch (RuntimeException e) {
- LOG.error("error during delivery", e);
+ logger.error("error during delivery", e);
}
}
Modified: servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/SequenceReader.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/SequenceReader.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/SequenceReader.java (original)
+++ servicemix/components/trunk/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/resequence/SequenceReader.java Fri Feb 4 09:05:47 2011
@@ -23,16 +23,13 @@ import java.util.concurrent.BlockingQueu
import javax.jbi.messaging.MessageExchange;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.executors.Executor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-/**
- * @author Martin Krasser
- */
public class SequenceReader implements Runnable {
- private static final Log LOG = LogFactory.getLog(SequenceReader.class);
+ private final Logger logger = LoggerFactory.getLogger(SequenceReader.class);
private static final MessageExchange STOP = createStopSignal();
@@ -54,17 +51,17 @@ public class SequenceReader implements R
// block until message exchange is available
MessageExchange me = queue.take();
if (me == STOP) {
- LOG.info("exit processing loop after cancellation");
+ logger.info("exit processing loop after cancellation");
return;
}
// send sync to preserve message order
sender.sendSync(me);
} catch (InterruptedException e) {
- LOG.info("exit processing loop after interrupt");
+ logger.info("exit processing loop after interrupt");
return;
} catch (Exception e) {
// TODO: handle sendSync errors and faults
- LOG.error("caught and ignored exception", e);
+ logger.error("caught and ignored exception", e);
}
}
}