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 [2/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-http/src/test/java/org/apache/servicemix/http/ServerManagerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ServerManagerTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ServerManagerTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/ServerManagerTest.java Fri Feb 4 09:05:47 2011
@@ -26,15 +26,16 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.http.InvalidStatusResponseException;
import org.apache.servicemix.http.jetty.JettyContextManager;
import org.mortbay.jetty.handler.ContextHandler;
import org.mortbay.thread.QueuedThreadPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ServerManagerTest extends TestCase {
- private static transient Log log = LogFactory.getLog(ServerManagerTest.class);
+
+ private final static Logger logger = LoggerFactory.getLogger(ServerManagerTest.class);
String port1 = System.getProperty("http.port1");
String port2 = System.getProperty("http.port2");
@@ -197,7 +198,7 @@ public class ServerManagerTest extends T
}
public void process(HttpServletRequest request, HttpServletResponse response) throws Exception {
- log.info(request);
+ logger.info(request.toString());
}
}
@@ -212,7 +213,7 @@ public class ServerManagerTest extends T
}
public void process(HttpServletRequest request, HttpServletResponse response) throws Exception {
- log.info(request);
+ logger.info(request.toString());
}
}
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java Fri Feb 4 09:05:47 2011
@@ -27,12 +27,12 @@ import javax.wsdl.extensions.soap.SOAPOp
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.SpringTestSupport;
@@ -40,7 +40,8 @@ import org.apache.xbean.spring.context.C
import org.springframework.context.support.AbstractXmlApplicationContext;
public class WsdlRoundtripTest extends SpringTestSupport {
- private static transient Log log = LogFactory.getLog(WsdlRoundtripTest.class);
+
+ private final Logger logger = LoggerFactory.getLogger(WsdlRoundtripTest.class);
String port1 = System.getProperty("http.port1");
@@ -65,7 +66,7 @@ public class WsdlRoundtripTest extends S
StringWriter writer = new StringWriter();
factory.newWSDLWriter().writeWSDL(def, writer);
- log.info(writer.toString());
+ logger.info(writer.toString());
Binding b = (Binding) def.getBindings().values().iterator().next();
BindingOperation bop = (BindingOperation) b.getBindingOperations().iterator().next();
assertEquals(1, bop.getExtensibilityElements().size());
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/addressing/AddressingConsumerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/addressing/AddressingConsumerTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/addressing/AddressingConsumerTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/addressing/AddressingConsumerTest.java Fri Feb 4 09:05:47 2011
@@ -9,6 +9,8 @@ import java.io.ByteArrayOutputStream;
import javax.xml.namespace.QName;
import javax.jbi.servicedesc.ServiceEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import junit.framework.TestCase;
@@ -22,14 +24,11 @@ import org.apache.servicemix.soap.ws.add
import org.apache.servicemix.soap.api.Policy;
import org.apache.servicemix.soap.util.DomUtil;
import org.apache.servicemix.components.util.EchoComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
-import org.springframework.util.xml.DomUtils;
public class AddressingConsumerTest extends TestCase {
- private static transient Log log = LogFactory.getLog(AddressingConsumerTest.class);
+ private final Logger logger = LoggerFactory.getLogger(AddressingConsumerTest.class);
String port1 = System.getProperty("http.port1");
protected JBIContainer container;
@@ -104,7 +103,7 @@ public class AddressingConsumerTest exte
InputStream is = connection.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
FileUtil.copyInputStream(is, baos);
- log.info(baos.toString());
+ logger.info(baos.toString());
}
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/JaasUserRealmTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/JaasUserRealmTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/JaasUserRealmTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/JaasUserRealmTest.java Fri Feb 4 09:05:47 2011
@@ -23,13 +23,14 @@ import javax.security.auth.Subject;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.security.AuthenticationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JaasUserRealmTest extends TestCase {
- private static transient Log log = LogFactory.getLog(JaasUserRealmTest.class);
+ private final static Logger logger = LoggerFactory.getLogger(JaasUserRealmTest.class);
+
private static final String USERNAME = "username";
private static final String PASSWORD = "password";
private JaasUserRealm jaasUserRealm;
@@ -108,7 +109,7 @@ public class JaasUserRealmTest extends T
if (credentials == null) {
throw new GeneralSecurityException("authenticate() failed due to null credentials");
}
- log.info("authenticate() called");
+ logger.info("authenticate() called");
}
}
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/SmxHttpExchangeTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/SmxHttpExchangeTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/SmxHttpExchangeTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/jetty/SmxHttpExchangeTest.java Fri Feb 4 09:05:47 2011
@@ -21,13 +21,14 @@ import java.io.Reader;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mortbay.io.ByteArrayBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SmxHttpExchangeTest extends TestCase {
- private static transient Log log = LogFactory.getLog(SmxHttpExchangeTest.class);
+ private final Logger logger = LoggerFactory.getLogger(SmxHttpExchangeTest.class);
+
private static final String STRRESPONSECONTENT = "valid response content";
private SmxHttpExchange httpExchange;
@@ -50,7 +51,7 @@ public class SmxHttpExchangeTest extends
httpExchange.getResponseStatus();
fail("getResponseStatus() should fail with IllegalStateException");
} catch (IllegalStateException ise) {
- log.info("testGetResponseStatusException() got the expected exception");
+ logger.info("testGetResponseStatusException() got the expected exception");
}
}
@@ -64,7 +65,7 @@ public class SmxHttpExchangeTest extends
httpExchange.getResponseFields();
fail("getResponseFields() should fail with IllegalStateException");
} catch (IllegalStateException ise) {
- log.info("testGetResponseFieldsException() got the expected exception");
+ logger.info("testGetResponseFieldsException() got the expected exception");
}
}
Modified: servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java Fri Feb 4 09:05:47 2011
@@ -22,6 +22,8 @@ import java.net.URL;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.apache.commons.httpclient.HttpClient;
@@ -29,8 +31,6 @@ import org.apache.commons.httpclient.Use
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.util.FileUtil;
@@ -39,7 +39,8 @@ import org.apache.xbean.spring.context.C
import org.springframework.context.support.AbstractXmlApplicationContext;
public class HttpSecurityTest extends SpringTestSupport {
- private static transient Log log = LogFactory.getLog(HttpSecurityTest.class);
+
+ private final static Logger logger = LoggerFactory.getLogger(HttpSecurityTest.class);
String port1 = System.getProperty("http.port1");
@@ -52,7 +53,7 @@ public class HttpSecurityTest extends Sp
System.setProperty("java.security.auth.login.config", path);
}
}
- log.info("Path to login config: " + path);
+ logger.info("Path to login config: " + path);
}
protected void setUp() throws Exception {
@@ -70,7 +71,7 @@ public class HttpSecurityTest extends Sp
testAuthenticate("user2", "user2");
fail("User2 is not authorized");
} catch (Exception e) {
- log.info(e.getMessage(), e);
+ logger.info(e.getMessage(), e);
// ok
}
}
@@ -80,7 +81,7 @@ public class HttpSecurityTest extends Sp
testAuthenticate("user2", "userx");
fail("User2 has bad credentials");
} catch (Exception e) {
- log.info(e.getMessage(), e);
+ logger.info(e.getMessage(), e);
// ok
}
}
@@ -117,7 +118,7 @@ public class HttpSecurityTest extends Sp
int state = client.executeMethod(method);
String str = method.getResponseBodyAsString();
- log.info(str);
+ logger.info(str);
if (state != HttpServletResponse.SC_OK && state != HttpServletResponse.SC_ACCEPTED) {
throw new IllegalStateException("Http status: " + state);
}
@@ -137,7 +138,7 @@ public class HttpSecurityTest extends Sp
method.setRequestEntity(new StringRequestEntity(request));
int state = client.executeMethod(method);
String str = method.getResponseBodyAsString();
- log.info(str);
+ logger.info(str);
assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, state);
Element e = new SourceTransformer().toDOMElement(new StringSource(str));
assertEquals("Envelope", e.getLocalName());
@@ -161,7 +162,7 @@ public class HttpSecurityTest extends Sp
method.setRequestEntity(new StringRequestEntity(request));
int state = client.executeMethod(method);
String str = method.getResponseBodyAsString();
- log.info(str);
+ logger.info(str);
assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, state);
Element e = new SourceTransformer().toDOMElement(new StringSource(str));
assertEquals("Envelope", e.getLocalName());
Modified: servicemix/components/trunk/bindings/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/pom.xml Fri Feb 4 09:05:47 2011
@@ -123,6 +123,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<scope>provided</scope>
@@ -167,11 +172,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<scope>test</scope>
@@ -228,11 +228,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java Fri Feb 4 09:05:47 2011
@@ -34,8 +34,6 @@ import javax.jms.Session;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.EndpointComponentContext;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.soap.Context;
@@ -45,16 +43,18 @@ import org.apache.servicemix.soap.SoapEx
import org.apache.servicemix.soap.marshalers.SoapMessage;
import org.apache.servicemix.store.Store;
import org.apache.servicemix.store.memory.MemoryStoreFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractJmsProcessor implements SoapExchangeProcessor {
+ protected final Logger logger = LoggerFactory.getLogger(getClass());
+
public static final String STYLE_QUEUE = "queue";
public static final String STYLE_TOPIC = "topic";
public static final String CONTENT_TYPE = "MimeContentType";
- protected final transient Log log = LogFactory.getLog(getClass());
-
protected JmsEndpoint endpoint;
protected Connection connection;
protected SoapHelper soapHelper;
@@ -172,7 +172,7 @@ public abstract class AbstractJmsProcess
try {
stop();
} catch (Exception inner) {
- // TODO: log
+ // TODO: logger
}
throw e;
}
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java Fri Feb 4 09:05:47 2011
@@ -34,12 +34,12 @@ import javax.resource.spi.ResourceAdapte
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.transaction.TransactionManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jms.AbstractJmsProcessor;
import org.apache.servicemix.jms.JmsEndpoint;
import org.apache.servicemix.soap.Context;
import org.jencks.SingletonEndpointFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -47,7 +47,7 @@ import org.jencks.SingletonEndpointFacto
*/
public class JcaConsumerProcessor extends AbstractJmsProcessor implements MessageListener {
- private static final Log LOG = LogFactory.getLog(JcaConsumerProcessor.class);
+ private final Logger logger = LoggerFactory.getLogger(JcaConsumerProcessor.class);
protected Map pendingMessages = new ConcurrentHashMap();
protected ResourceAdapter resourceAdapter;
@@ -96,9 +96,7 @@ public class JcaConsumerProcessor extend
public void onMessage(final Message message) {
try {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received jms message " + message);
- }
+ logger.debug("Received jms message " + message);
Context context = createContext();
MessageExchange exchange = toNMS(message, context);
if (!(exchange instanceof InOnly)) {
@@ -114,7 +112,7 @@ public class JcaConsumerProcessor extend
channel.send(exchange);
}
} catch (Throwable e) {
- LOG.error("Error while handling jms message", e);
+ logger.error("Error while handling jms message", e);
}
}
@@ -133,7 +131,7 @@ public class JcaConsumerProcessor extend
tm.setRollbackOnly();
return;
} else if (exchange instanceof InOnly) {
- LOG.info("Exchange in error: " + exchange, exchange.getError());
+ logger.info("Exchange in error: " + exchange, exchange.getError());
return;
} else {
connection = connectionFactory.createConnection();
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java Fri Feb 4 09:05:47 2011
@@ -77,14 +77,14 @@ public class MultiplexingConsumerProcess
}
public void onMessage(final Message message) {
- if (log.isDebugEnabled()) {
- log.debug("Received jms message " + message);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received jms message " + message);
}
endpoint.getServiceUnit().getComponent().getExecutor(MessageExchange.Role.CONSUMER).execute(new Runnable() {
public void run() {
try {
- if (log.isDebugEnabled()) {
- log.debug("Handling jms message " + message);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Handling jms message " + message);
}
Context context = createContext();
MessageExchange exchange = toNMS(message, context);
@@ -93,7 +93,7 @@ public class MultiplexingConsumerProcess
pendingMessages.put(exchange.getExchangeId(), context);
channel.send(exchange);
} catch (Throwable e) {
- log.error("Error while handling jms message", e);
+ logger.error("Error while handling jms message", e);
}
}
});
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java Fri Feb 4 09:05:47 2011
@@ -62,14 +62,14 @@ public class MultiplexingProviderProcess
}
public void onMessage(final Message message) {
- if (log.isDebugEnabled()) {
- log.debug("Received jms message " + message);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received jms message " + message);
}
endpoint.getServiceUnit().getComponent().getExecutor(MessageExchange.Role.PROVIDER).execute(new Runnable() {
public void run() {
InOut exchange = null;
- if (log.isDebugEnabled()) {
- log.debug("Handling jms message " + message);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Handling jms message " + message);
}
String correlationID = null;
try {
@@ -79,7 +79,7 @@ public class MultiplexingProviderProcess
throw new IllegalStateException();
}
} catch (Exception e) {
- log.error("Could not find exchange " + (correlationID == null ? "" : correlationID), e);
+ logger.error("Could not find exchange " + (correlationID == null ? "" : correlationID), e);
return;
}
try {
@@ -95,13 +95,13 @@ public class MultiplexingProviderProcess
((InOut) exchange).setOutMessage(msg);
}
} catch (Exception e) {
- log.error("Error while handling jms message", e);
+ logger.error("Error while handling jms message", e);
exchange.setError(e);
}
try {
channel.send(exchange);
} catch (MessagingException e) {
- log.error("Error while handling jms message", e);
+ logger.error("Error while handling jms message", e);
}
}
});
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java Fri Feb 4 09:05:47 2011
@@ -98,7 +98,7 @@ public class StandardConsumerProcessor e
}
}
} catch (Exception e) {
- log.error("", e);
+ logger.error("", e);
} finally {
synchronized (running) {
running.notify();
@@ -108,9 +108,7 @@ public class StandardConsumerProcessor e
public void onMessage(final Message message) {
try {
- if (log.isDebugEnabled()) {
- log.debug("Received jms message " + message);
- }
+ logger.debug("Received jms message " + message);
Context context = createContext();
MessageExchange exchange = toNMS(message, context);
if (!channel.sendSync(exchange)) {
@@ -139,7 +137,7 @@ public class StandardConsumerProcessor e
}
}
} catch (Throwable e) {
- log.error("Error while handling jms message", e);
+ logger.error("Error while handling jms message", e);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java Fri Feb 4 09:05:47 2011
@@ -34,8 +34,6 @@ import javax.mail.util.ByteArrayDataSour
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.components.jms.JmsReceiverComponent;
import org.apache.servicemix.components.jms.JmsServiceComponent;
import org.apache.servicemix.components.util.EchoComponent;
@@ -44,11 +42,13 @@ import org.apache.servicemix.jbi.jaxp.So
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.MessageCreator;
public class JMSComponentTest extends AbstractJmsTestSupport {
- private static Log logger = LogFactory.getLog(JMSComponentTest.class);
+ private final Logger logger = LoggerFactory.getLogger(JMSComponentTest.class);
public void testProviderInOnly() throws Exception {
// JMS Component
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java Fri Feb 4 09:05:47 2011
@@ -28,8 +28,6 @@ import javax.jms.TextMessage;
import javax.xml.namespace.QName;
import org.apache.activemq.pool.PooledConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.components.util.MockServiceComponent;
@@ -42,6 +40,8 @@ import org.apache.servicemix.jms.endpoin
import org.apache.servicemix.tck.MessageList;
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
@@ -51,7 +51,7 @@ import org.w3c.dom.Element;
public class JmsConsumerEndpointTest extends AbstractJmsTestSupport {
- private static Log logger = LogFactory.getLog(JmsConsumerEndpointTest.class);
+ private final Logger logger = LoggerFactory.getLogger(JmsConsumerEndpointTest.class);
/**
* Test property name.
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerToProviderEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerToProviderEndpointTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerToProviderEndpointTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerToProviderEndpointTest.java Fri Feb 4 09:05:47 2011
@@ -57,7 +57,7 @@ public class JmsConsumerToProviderEndpoi
}
public void testStaxSourceHandling() throws Exception {
- //switch to info log level to ensure use of StaxSource
+ //switch to info logger level to ensure use of StaxSource
Level old = switchLogLevel(Level.INFO);
//send a mesage to the 'from' queue
@@ -74,7 +74,7 @@ public class JmsConsumerToProviderEndpoi
assertTrue(result instanceof TextMessage);
assertEquals(MESSAGE, ((TextMessage) result).getText());
- //and switch back to whatever log leve we started with
+ //and switch back to whatever logger leve we started with
switchLogLevel(old);
}
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderConsumerEndpointTest.java Fri Feb 4 09:05:47 2011
@@ -33,8 +33,6 @@ import javax.xml.transform.Source;
import org.apache.activemq.pool.PooledConnectionFactory;
import org.apache.activemq.broker.region.RegionBroker;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -44,11 +42,13 @@ import org.apache.servicemix.jms.endpoin
import org.apache.servicemix.jms.endpoints.JmsConsumerEndpoint;
import org.apache.servicemix.jms.endpoints.JmsProviderEndpoint;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
public class JmsProviderConsumerEndpointTest extends AbstractJmsTestSupport {
- private static Log logger = LogFactory.getLog(JmsProviderConsumerEndpointTest.class);
+ private final Logger logger = LoggerFactory.getLogger(JmsProviderConsumerEndpointTest.class);
public void testProviderConsumerInOut() throws Exception {
ConnectionFactory connFactory = new PooledConnectionFactory(connectionFactory);
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java Fri Feb 4 09:05:47 2011
@@ -21,19 +21,19 @@ import javax.jbi.messaging.InOut;
import javax.naming.Context;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.apache.xbean.spring.jndi.SpringInitialContextFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
public class JmsSpringTest extends SpringTestSupport {
- private static Log logger = LogFactory.getLog(JmsSpringTest.class);
+ private final Logger logger = LoggerFactory.getLogger(JmsSpringTest.class);
public void test() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsStandardConsumerEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsStandardConsumerEndpointTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsStandardConsumerEndpointTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsStandardConsumerEndpointTest.java Fri Feb 4 09:05:47 2011
@@ -27,10 +27,10 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.components.util.MockServiceComponent;
@@ -45,7 +45,7 @@ import org.springframework.jms.core.Mess
public class JmsStandardConsumerEndpointTest extends AbstractJmsTestSupport {
- private static Log logger = LogFactory.getLog(JmsStandardConsumerEndpointTest.class);
+ private final Logger logger = LoggerFactory.getLogger(JmsStandardConsumerEndpointTest.class);
/**
* Test property name.
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsURITest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsURITest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsURITest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsURITest.java Fri Feb 4 09:05:47 2011
@@ -24,11 +24,11 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.util.URIResolver;
@@ -38,7 +38,7 @@ import org.apache.servicemix.tck.Receive
public class JmsURITest extends AbstractJmsTestSupport {
- private static Log logger = LogFactory.getLog(JmsURITest.class);
+ private final Logger logger = LoggerFactory.getLogger(JmsURITest.class);
public void testResolveEndpoint() throws Exception {
JmsComponent jms = new JmsComponent();
Modified: servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java Fri Feb 4 09:05:47 2011
@@ -31,10 +31,10 @@ import javax.wsdl.Service;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -42,7 +42,7 @@ import org.apache.servicemix.jbi.jaxp.St
public class JmsXBeanDeployerTest extends AbstractJmsTestSupport {
- private static Log logger = LogFactory.getLog(JmsXBeanDeployerTest.class);
+ private final Logger logger = LoggerFactory.getLogger(JmsXBeanDeployerTest.class);
public void test() throws Exception {
// JMS Component
Modified: servicemix/components/trunk/bindings/servicemix-ldap/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-ldap/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-ldap/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-ldap/pom.xml Fri Feb 4 09:05:47 2011
@@ -68,11 +68,6 @@
<!-- provided -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
Modified: servicemix/components/trunk/bindings/servicemix-mail/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-mail/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-mail/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-mail/pom.xml Fri Feb 4 09:05:47 2011
@@ -60,10 +60,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
Modified: servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java Fri Feb 4 09:05:47 2011
@@ -36,13 +36,13 @@ import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
import javax.mail.search.FlagTerm;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.endpoints.PollingEndpoint;
import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
import org.apache.servicemix.mail.marshaler.DefaultMailMarshaler;
import org.apache.servicemix.mail.utils.MailConnectionConfiguration;
import org.apache.servicemix.mail.utils.MailUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is the polling endpoint for the mail component.
@@ -51,7 +51,8 @@ import org.apache.servicemix.mail.utils.
* @author lhein
*/
public class MailPollerEndpoint extends PollingEndpoint implements MailEndpointType {
- private static final transient Log LOG = LogFactory.getLog(MailPollerEndpoint.class);
+
+ private final Logger logger = LoggerFactory.getLogger(MailPollerEndpoint.class);
private AbstractMailMarshaler marshaler = new DefaultMailMarshaler();
@@ -166,10 +167,10 @@ public class MailPollerEndpoint extends
* @see org.apache.servicemix.components.util.PollingComponentSupport#poll()
*/
public void poll() throws Exception {
- LOG.debug("Polling mailfolder " + config.getFolderName() + " at host " + config.getHost() + "...");
+ logger.debug("Polling mailfolder " + config.getFolderName() + " at host " + config.getHost() + "...");
if (maxFetchSize == 0) {
- LOG.debug("The configuration is set to poll no new messages at all...skipping.");
+ logger.debug("The configuration is set to poll no new messages at all...skipping.");
return;
}
@@ -313,7 +314,7 @@ public class MailPollerEndpoint extends
cleanUpSeenMessages();
}
} catch (Exception ignored) {
- logger.debug(ignored);
+ logger.debug("", ignored);
}
}
}
@@ -483,7 +484,7 @@ public class MailPollerEndpoint extends
try {
this.config = MailUtils.configure(this.connection);
} catch (ParseException ex) {
- LOG.error("The configured connection uri is invalid", ex);
+ logger.error("The configured connection uri is invalid", ex);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java Fri Feb 4 09:05:47 2011
@@ -16,8 +16,6 @@
*/
package org.apache.servicemix.mail;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
@@ -25,6 +23,8 @@ import org.apache.servicemix.mail.marsha
import org.apache.servicemix.mail.utils.IgnoreList;
import org.apache.servicemix.mail.utils.MailConnectionConfiguration;
import org.apache.servicemix.mail.utils.MailUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jbi.management.DeploymentException;
import javax.jbi.messaging.ExchangeStatus;
@@ -46,7 +46,8 @@ import java.util.Properties;
* @author lhein
*/
public class MailSenderEndpoint extends ProviderEndpoint implements MailEndpointType {
- private static final transient Log LOG = LogFactory.getLog(MailSenderEndpoint.class);
+
+ private final Logger logger = LoggerFactory.getLogger(MailSenderEndpoint.class);
private AbstractMailMarshaler marshaler = new DefaultMailMarshaler();
private MailConnectionConfiguration config;
@@ -340,7 +341,7 @@ public class MailSenderEndpoint extends
try {
this.config = MailUtils.configure(this.connection);
} catch (ParseException ex) {
- LOG.error("The configured connection uri is invalid", ex);
+ logger.error("The configured connection uri is invalid", ex);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java Fri Feb 4 09:05:47 2011
@@ -16,11 +16,11 @@
*/
package org.apache.servicemix.mail.marshaler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.mail.utils.MailContentType;
import org.apache.servicemix.mail.utils.MailUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
@@ -47,7 +47,8 @@ import java.util.Iterator;
* @author lhein
*/
public class DefaultMailMarshaler extends AbstractMailMarshaler {
- private static final Log log = LogFactory.getLog(DefaultMailMarshaler.class);
+
+ private final Logger logger = LoggerFactory.getLogger(DefaultMailMarshaler.class);
/*
* (non-Javadoc)
@@ -69,7 +70,7 @@ public class DefaultMailMarshaler extend
}
} catch (Exception e) {
nmsg.setProperty(AbstractMailMarshaler.MSG_TAG_TEXT, AbstractMailMarshaler.DUMMY_CONTENT);
- log.error("Unable to extract the mail content: " + MailUtils.extractBodyFromMail(mailMsg), e);
+ logger.error("Unable to extract the mail content: " + MailUtils.extractBodyFromMail(mailMsg), e);
}
// extract the attachments
@@ -351,7 +352,7 @@ public class DefaultMailMarshaler extend
dh.writeTo(bos);
bos.close();
- log.debug("Saved temp file: " + f.getName() + " with length: " + f.length());
+ logger.debug("Saved temp file: " + f.getName() + " with length: " + f.length());
// add the file to the temporary resources list
addTemporaryResource(exchange.getExchangeId(), f);
Modified: servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java (original)
+++ servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java Fri Feb 4 09:05:47 2011
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.mail.security;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
@@ -45,8 +45,9 @@ public class CustomSSLSocketFactory exte
*/
public static final String PROPERTY_SEPARATOR = ";";
- private static final String PREFIX = "Customized trust manager ";
- private static final Log LOG = LogFactory.getLog(CustomSSLSocketFactory.class);
+ private static final String PREFIX = "Customized trust manager ";
+
+ private final Logger logger = LoggerFactory.getLogger(CustomSSLSocketFactory.class);
private SSLSocketFactory factory;
@@ -67,7 +68,7 @@ public class CustomSSLSocketFactory exte
}
factory = sslcontext.getSocketFactory();
} catch (Exception ex) {
- LOG.error("Failed to create the dummy ssl socket factory.", ex);
+ logger.error("Failed to create the dummy ssl socket factory.", ex);
}
}
@@ -95,14 +96,14 @@ public class CustomSSLSocketFactory exte
if (tm instanceof TrustManager) {
managers.add((TrustManager)tm);
} else {
- LOG.error(PREFIX + name + " is not implementing TrustManager. Skipping...");
+ logger.error(PREFIX + name + " is not implementing TrustManager. Skipping...");
}
} catch (IllegalAccessException iaex) {
- LOG.error(PREFIX + name + " is not accessable. Skipping...", iaex);
+ logger.error(PREFIX + name + " is not accessable. Skipping...", iaex);
} catch (InstantiationException iex) {
- LOG.error(PREFIX + name + " could not be instantiated. Skipping...", iex);
+ logger.error(PREFIX + name + " could not be instantiated. Skipping...", iex);
} catch (ClassNotFoundException cnfex) {
- LOG.error(PREFIX + name + " was not found. Skipping...", cnfex);
+ logger.error(PREFIX + name + " was not found. Skipping...", cnfex);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java (original)
+++ servicemix/components/trunk/bindings/servicemix-mail/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java Fri Feb 4 09:05:47 2011
@@ -16,11 +16,11 @@
*/
package org.apache.servicemix.mail.utils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
import org.apache.servicemix.mail.security.CustomSSLSocketFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.activation.DataHandler;
import javax.jbi.messaging.MessagingException;
@@ -49,7 +49,8 @@ import java.util.Properties;
* @author lhein
*/
public final class MailUtils {
- private static final Log log = LogFactory.getLog(MailUtils.class);
+
+ private final static Logger logger = LoggerFactory.getLogger(MailUtils.class);
public static final String KEY_BODY_TEXT = "text";
public static final String KEY_BODY_HTML = "html";
@@ -288,9 +289,9 @@ public final class MailUtils {
}
}
try {
- log.debug("Setting property: " + header.getName() + " = " + MimeUtility.decodeText(header.getValue()));
+ logger.debug("Setting property: " + header.getName() + " = " + MimeUtility.decodeText(header.getValue()));
} catch (UnsupportedEncodingException e) {
- log.debug("Setting property: " + header.getName() + " = " + header.getValue());
+ logger.debug("Setting property: " + header.getName() + " = " + header.getValue());
}
}
@@ -363,7 +364,7 @@ public final class MailUtils {
Multipart mup = (Multipart)part.getContent();
extractAttachmentsFromMultipart(mup, nmsg);
} catch (UnsupportedEncodingException e) {
- log.error("Unable to decode the mail because charset is not supported.", e);
+ logger.error("Unable to decode the mail because charset is not supported.", e);
}
} else {
if (i < 1) {
@@ -456,21 +457,21 @@ public final class MailUtils {
}
}
} catch (UnsupportedEncodingException e) {
- log.error("Unable to decode the mail because charset is not supported.", e);
+ logger.error("Unable to decode the mail because charset is not supported.", e);
}
} else if (part.isMimeType(MailContentType.TEXT_PLAIN.getMimeType())) {
try {
content.put(KEY_BODY_TEXT, (String)part.getContent());
} catch (UnsupportedEncodingException e) {
content.put(KEY_BODY_TEXT, AbstractMailMarshaler.DUMMY_CONTENT);
- log.error("Unable to decode the mail because charset is not supported.", e);
+ logger.error("Unable to decode the mail because charset is not supported.", e);
}
} else if (part.isMimeType(MailContentType.TEXT_HTML.getMimeType()) ||
part.isMimeType(MailContentType.TEXT_XML.getMimeType()) ) {
try {
content.put(KEY_BODY_HTML, (String)part.getContent());
} catch (UnsupportedEncodingException e) {
- log.error("Unable to decode the mail because charset is not supported.", e);
+ logger.error("Unable to decode the mail because charset is not supported.", e);
}
} else {
// can't parse that...skipping
@@ -501,7 +502,7 @@ public final class MailUtils {
javax.mail.MessagingException, IOException {
Object subContent = mbp.getContent();
- log.debug("Parsing: " + subContent.getClass().getName());
+ logger.debug("Parsing: " + subContent.getClass().getName());
if (subContent instanceof InputStream) {
String cid = mbp.getContentID();
@@ -509,7 +510,7 @@ public final class MailUtils {
cid = cid.replaceAll("<", "").replaceAll(">", "").toLowerCase();
}
- log.debug("Adding special attachment: "
+ logger.debug("Adding special attachment: "
+ (mbp.getFileName() != null ? mbp.getFileName() : cid));
// read the stream into a byte array
@@ -573,7 +574,7 @@ public final class MailUtils {
html = parts.get(KEY_BODY_HTML);
}
} catch (Exception e) {
- log.error("Error extracting body from message " + mailMsg, e);
+ logger.error("Error extracting body from message " + mailMsg, e);
}
}
@@ -605,9 +606,9 @@ public final class MailUtils {
Multipart mp = (Multipart)content;
try {
MailUtils.extractAttachmentsFromMultipart(mp, nmsg);
- log.debug("Attachments found: " + nmsg.getAttachmentNames().size());
+ logger.debug("Attachments found: " + nmsg.getAttachmentNames().size());
} catch (Exception e) {
- log.error("Error extracting attachments from message " + mailMsg, e);
+ logger.error("Error extracting attachments from message " + mailMsg, e);
}
}
}
Modified: servicemix/components/trunk/bindings/servicemix-rmi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-rmi/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-rmi/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-rmi/pom.xml Fri Feb 4 09:05:47 2011
@@ -80,10 +80,6 @@
<version>${cxf.version}</version>
</dependency>
<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/bindings/servicemix-rmi/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-rmi/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-rmi/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-rmi/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java Fri Feb 4 09:05:47 2011
@@ -23,12 +23,13 @@ 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.cxf.databinding.DataBinding;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.rmi.RmiExchange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <p>
* Default RMI marshaler.
@@ -38,7 +39,7 @@ import org.apache.servicemix.rmi.RmiExch
*/
public class DefaultRmiMarshaler implements RmiMarshalerSupport {
- private final static transient Log LOG = LogFactory.getLog(DefaultRmiMarshaler.class);
+ private final Logger logger = LoggerFactory.getLogger(DefaultRmiMarshaler.class);
private DataBinding dataBinding;
@@ -79,7 +80,7 @@ public class DefaultRmiMarshaler impleme
*/
public void rmiExchangeToNmr(NormalizedMessage in, RmiExchange rmiExchange) throws MessagingException {
// marshal the RMI exchange into the "in" normalized message using JAXB
- LOG.debug("Marshal a RMI exchange into the in normalized message using JAXB.");
+ logger.debug("Marshal a RMI exchange into the in normalized message using JAXB.");
// TODO only for testing purpose
in.setContent(new StringSource("<TEST></TEST>"));
Modified: servicemix/components/trunk/bindings/servicemix-rmi/src/test/java/org/apache/servicemix/rmi/RmiXBeanTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-rmi/src/test/java/org/apache/servicemix/rmi/RmiXBeanTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-rmi/src/test/java/org/apache/servicemix/rmi/RmiXBeanTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-rmi/src/test/java/org/apache/servicemix/rmi/RmiXBeanTest.java Fri Feb 4 09:05:47 2011
@@ -21,8 +21,6 @@ import java.rmi.registry.LocateRegistry;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.springframework.core.io.ClassPathResource;
@@ -35,9 +33,6 @@ import org.springframework.core.io.Class
*/
public class RmiXBeanTest extends TestCase {
- // logging facility
- private final static transient Log LOG = LogFactory.getLog(RmiXBeanTest.class);
-
protected JBIContainer container;
protected RmiComponent component;
Modified: servicemix/components/trunk/bindings/servicemix-smpp/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/pom.xml Fri Feb 4 09:05:47 2011
@@ -78,10 +78,6 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.code</groupId>
<artifactId>jsmpp</artifactId>
<version>${jsmpp.version}</version>
@@ -102,6 +98,11 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- test -->
<dependency>
@@ -133,11 +134,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java Fri Feb 4 09:05:47 2011
@@ -16,8 +16,6 @@
*/
package org.apache.servicemix.smpp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.endpoints.ConsumerEndpoint;
import org.apache.servicemix.smpp.marshaler.DefaultSmppMarshaler;
import org.apache.servicemix.smpp.marshaler.SmppMarshalerSupport;
@@ -25,6 +23,8 @@ import org.jsmpp.bean.*;
import org.jsmpp.session.BindParameter;
import org.jsmpp.session.MessageReceiverListener;
import org.jsmpp.session.SMPPSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jbi.management.DeploymentException;
import javax.jbi.messaging.*;
@@ -41,8 +41,7 @@ import java.io.IOException;
*/
public class SmppConsumerEndpoint extends ConsumerEndpoint implements SmppEndpointType {
- // logging facility
- private final static transient Log log = LogFactory.getLog(SmppConsumerEndpoint.class);
+ private final Logger logger = LoggerFactory.getLogger(SmppConsumerEndpoint.class);
// default SMPP port
private static final int SMPP_DEFAULT_PORT = 2775;
@@ -98,7 +97,7 @@ public class SmppConsumerEndpoint extend
// check for valid port number
if (this.port <= 0) {
- log.warn("Invalid SMPP port specified. Use the default one : " + SMPP_DEFAULT_PORT);
+ logger.warn("Invalid SMPP port specified. Use the default one : " + SMPP_DEFAULT_PORT);
this.port = SMPP_DEFAULT_PORT;
}
// check for valid host
@@ -180,7 +179,7 @@ public class SmppConsumerEndpoint extend
marshaler.toNMS(in, deliverSm);
send(exchange);
} catch (MessagingException messagingException) {
- log.error("Unable to send the received SMS to the NMR", messagingException);
+ logger.error("Unable to send the received SMS to the NMR", messagingException);
}
}
@@ -194,7 +193,7 @@ public class SmppConsumerEndpoint extend
NumberingPlanIndicator.UNKNOWN,
null));
} catch (IOException ioException) {
- log.error("Error connecting to the SMPP server", ioException);
+ logger.error("Error connecting to the SMPP server", ioException);
return;
}
}
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java Fri Feb 4 09:05:47 2011
@@ -16,8 +16,6 @@
*/
package org.apache.servicemix.smpp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.jbi.helper.MessageUtil;
import org.apache.servicemix.smpp.marshaler.DefaultSmppMarshaler;
@@ -31,6 +29,8 @@ import org.jsmpp.session.BindParameter;
import org.jsmpp.session.SMPPSession;
import org.jsmpp.util.AbsoluteTimeFormatter;
import org.jsmpp.util.TimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jbi.management.DeploymentException;
import javax.jbi.messaging.MessageExchange;
@@ -51,8 +51,7 @@ import java.util.Date;
*/
public class SmppProviderEndpoint extends ProviderEndpoint implements SmppEndpointType {
- // logging facility
- private final static transient Log log = LogFactory.getLog(SmppProviderEndpoint.class);
+ private final Logger logger = LoggerFactory.getLogger(SmppProviderEndpoint.class);
// SMPP default port number
private final static int SMPP_DEFAULT_PORT = 2775;
@@ -107,7 +106,7 @@ public class SmppProviderEndpoint extend
// check for valid port number
if (this.port <= 0) {
- log.warn("Invalid SMPP port specified. Use the default one : " + SMPP_DEFAULT_PORT);
+ logger.warn("Invalid SMPP port specified. Use the default one : " + SMPP_DEFAULT_PORT);
this.port = SMPP_DEFAULT_PORT;
}
// check for valid host
@@ -150,7 +149,7 @@ public class SmppProviderEndpoint extend
NumberingPlanIndicator.UNKNOWN,
null));
} catch (IOException ioException) {
- log.error("Error connecting to the SMPP server", ioException);
+ logger.error("Error connecting to the SMPP server", ioException);
return;
}
}
@@ -216,7 +215,7 @@ public class SmppProviderEndpoint extend
MessageRequest sm = marshaler.fromNMS(exchange, in);
try {
- log.debug("Submiting request: " + sm);
+ logger.debug("Submiting request: " + sm);
String messageId = session
.submitShortMessage("CMT", TypeOfNumber.valueOf(sm.getSourceAddrTon()),
NumberingPlanIndicator.valueOf(sm.getSourceAddrNpi()),
@@ -228,21 +227,21 @@ public class SmppProviderEndpoint extend
Alphabet.ALPHA_DEFAULT), (byte) 0, sm
.getShortMessage());
- log.debug("Message sent with ID " + messageId);
+ logger.debug("Message sent with ID " + messageId);
} catch (PDUException pduException) {
- log.error("Invalid PDU parameter", pduException);
+ logger.error("Invalid PDU parameter", pduException);
fail(exchange, new Exception("Invalid PDU parameter", pduException));
} catch (ResponseTimeoutException responseTimeoutException) {
- log.error("Response timeout");
+ logger.error("Response timeout");
fail(exchange, new Exception("Response timeout", responseTimeoutException));
} catch (InvalidResponseException invalidResponseException) {
- log.error("Invalid response");
+ logger.error("Invalid response");
fail(exchange, new Exception("Invalid response", invalidResponseException));
} catch (NegativeResponseException negativeResponseException) {
- log.error("Negative response");
+ logger.error("Negative response");
fail(exchange, new Exception("Negative response", negativeResponseException));
} catch (IOException ioException) {
- log.error("IO error during message send");
+ logger.error("IO error during message send");
fail(exchange, new Exception("IO error during message send", ioException));
}
}
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java Fri Feb 4 09:05:47 2011
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.smpp.marshaler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.jsmpp.bean.*;
import org.jsmpp.bean.OptionalParameter.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
@@ -41,7 +41,8 @@ import java.util.List;
*/
public class DefaultSmppMarshaler implements SmppMarshalerSupport {
- private static final transient Log log = LogFactory.getLog(DefaultSmppMarshaler.class);
+ private final Logger logger = LoggerFactory.getLogger(DefaultSmppMarshaler.class);
+
private final static String TAG_MESSAGE = "message";
private final static String TAG_SOURCE = "source";
private final static String TAG_DESTINATION = "destination";
@@ -133,50 +134,50 @@ public class DefaultSmppMarshaler implem
if ((node = getNotEmptyNodeListOrNull(document, TAG_SOURCE)) != null) {
sm.setSourceAddr(getFirstNodeValue(node));
- log.debug(TAG_SOURCE + ": " + sm.getSourceAddr());
+ logger.debug(TAG_SOURCE + ": " + sm.getSourceAddr());
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_DESTINATION)) != null) {
sm.setDestAddress(getFirstNodeValue(node));
- log.debug(TAG_DESTINATION + ": " + sm.getDestAddress());
+ logger.debug(TAG_DESTINATION + ": " + sm.getDestAddress());
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_TEXT)) != null) {
sm.setShortMessage(getFirstNodeValue(node).getBytes());
- log.debug(TAG_TEXT + ": " + new String(sm.getShortMessage()));
+ logger.debug(TAG_TEXT + ": " + new String(sm.getShortMessage()));
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_TON)) != null) {
ton = getFirstNodeValue(node);
sm.setDestAddrTon(TypeOfNumber.valueOf(ton).value());
sm.setSourceAddrTon(TypeOfNumber.valueOf(ton).value());
- log.debug(TAG_TON + ": " + ton);
+ logger.debug(TAG_TON + ": " + ton);
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_NPI)) != null) {
npi = getFirstNodeValue(node);
sm.setDestAddrNpi(NumberingPlanIndicator.valueOf(npi).value());
sm.setSourceAddrNpi(NumberingPlanIndicator.valueOf(npi).value());
- log.debug(TAG_NPI + ": " + npi);
+ logger.debug(TAG_NPI + ": " + npi);
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_REGISTERED_DELIVERY)) != null) {
String registeredDelivery = getFirstNodeValue(node);
sm.setRegisteredDelivery(SMSCDeliveryReceipt.valueOf(registeredDelivery).value());
- log.debug(TAG_REGISTERED_DELIVERY + ": " + registeredDelivery);
+ logger.debug(TAG_REGISTERED_DELIVERY + ": " + registeredDelivery);
} else {
sm.setRegisteredDelivery(SMSCDeliveryReceipt.DEFAULT.value());
- log.debug(TAG_REGISTERED_DELIVERY + ": DEFAULT");
+ logger.debug(TAG_REGISTERED_DELIVERY + ": DEFAULT");
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_SCHEDULE_DELIVERY_TIME)) != null) {
sm.setScheduleDeliveryTime(getFirstNodeValue(node));
- log.debug(TAG_SCHEDULE_DELIVERY_TIME + ": " + sm.getScheduleDeliveryTime());
+ logger.debug(TAG_SCHEDULE_DELIVERY_TIME + ": " + sm.getScheduleDeliveryTime());
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_VALIDITY_PERIOD)) != null) {
sm.setValidityPeriod(getFirstNodeValue(node));
- log.debug(TAG_VALIDITY_PERIOD + ": " + sm.getValidityPeriod());
+ logger.debug(TAG_VALIDITY_PERIOD + ": " + sm.getValidityPeriod());
}
} catch (Exception exception) {
throw new TransformerException(exception);
@@ -216,38 +217,38 @@ public class DefaultSmppMarshaler implem
}
if (mr.getSourceAddr() == null || mr.getSourceAddr().trim().length() < 1) {
- log.error("The MessageRequest source address is not defined");
+ logger.error("The MessageRequest source address is not defined");
throw new MessagingException("The MessageRequest source address is not defined");
}
if (mr.getDestAddress() == null || mr.getDestAddress().trim().length() < 1) {
- log.error("The MessageRequest destination address is not defined");
+ logger.error("The MessageRequest destination address is not defined");
throw new MessagingException("The MessageRequest destination address is not defined");
}
try {
NumberingPlanIndicator.valueOf(mr.getDestAddrNpi());
} catch (IllegalArgumentException illegalArgumentException) {
- log.error("The MessageRequest destination numbering plan indicator is not valid");
+ logger.error("The MessageRequest destination numbering plan indicator is not valid");
throw new MessagingException("The MessageRequest destination numbering plan indicator is not valid");
}
try {
TypeOfNumber.valueOf(mr.getDestAddrTon());
} catch (IllegalArgumentException illegalArgumentException) {
- log.error("The MessageRequest destination type of number is not valid");
+ logger.error("The MessageRequest destination type of number is not valid");
throw new MessagingException("The MessageRequest destination type of number is not valid");
}
try {
determineSMSCDeliveryReceipt(mr.getRegisteredDelivery());
} catch (IllegalArgumentException illegalArgumentException) {
- log.error("The MessageRequest registered delivery is not valid");
+ logger.error("The MessageRequest registered delivery is not valid");
throw new MessagingException("The MessageRequest registered delivery is not valid");
}
if (mr.getShortMessage() == null || mr.getShortMessage().length == 0) {
- log.warn("Received message without text content. Ignore the message");
+ logger.warn("Received message without text content. Ignore the message");
return;
}
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java Fri Feb 4 09:05:47 2011
@@ -1,12 +1,12 @@
package org.apache.servicemix.smpp;
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.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
@@ -22,7 +22,7 @@ import java.net.URL;
*/
public class SmppXBeanDeployerTest extends TestCase {
- private final static transient Log LOG = LogFactory.getLog(SmppXBeanDeployerTest.class);
+ private final Logger logger = LoggerFactory.getLogger(SmppXBeanDeployerTest.class);
private static final String SOURCE = "0123456789";
private static final String DESTINATION = "9876543210";
@@ -97,7 +97,7 @@ public class SmppXBeanDeployerTest exten
// the failure is "normal" as there is no SMPP server mock for now
// TODO add a SMPP server mock
// fail("Received ERROR status: " + me.getError());
- LOG.warn("Received ERROR status");
+ logger.warn("Received ERROR status");
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java Fri Feb 4 09:05:47 2011
@@ -1,13 +1,13 @@
package org.apache.servicemix.smpp;
-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.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import javax.jbi.messaging.ExchangeStatus;
@@ -19,8 +19,7 @@ import javax.xml.namespace.QName;
*/
public class SpringComponentTest extends SpringTestSupport {
- // logging facility
- private final static transient Log LOG = LogFactory.getLog(SpringComponentTest.class);
+ private final Logger logger = LoggerFactory.getLogger(SpringComponentTest.class);
private final static String MESSAGE = "<message>" + "<source>0123456789</source>"
+ "<destination>9876543210</destination>"
@@ -37,7 +36,7 @@ public class SpringComponentTest extends
// the failure is "normal" as there is no SMPP server mock for now
// TODO add a SMPP server mock
// fail("Received ERROR status: " + me.getError());
- LOG.warn("Received ERROR status");
+ logger.warn("Received ERROR status");
} else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
Modified: servicemix/components/trunk/bindings/servicemix-snmp/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-snmp/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-snmp/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-snmp/pom.xml Fri Feb 4 09:05:47 2011
@@ -68,10 +68,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/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java Fri Feb 4 09:05:47 2011
@@ -22,12 +22,12 @@ 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.servicemix.common.endpoints.PollingEndpoint;
import org.apache.servicemix.snmp.marshaler.DefaultSnmpMarshaler;
import org.apache.servicemix.snmp.marshaler.SnmpMarshalerSupport;
import org.apache.servicemix.snmp.util.OIDList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.snmp4j.CommunityTarget;
import org.snmp4j.PDU;
import org.snmp4j.Snmp;
@@ -53,7 +53,8 @@ import org.snmp4j.transport.DefaultUdpTr
* @author lhein
*/
public class SnmpPollingEndpoint extends PollingEndpoint implements SnmpEndpointType, ResponseListener {
- private static final transient Log LOG = LogFactory.getLog(SnmpPollingEndpoint.class);
+
+ private final Logger logger = LoggerFactory.getLogger(SnmpPollingEndpoint.class);
public static final String DEFAULT_COMMUNITY = "public";
public static final int DEFAULT_SNMP_VERSION = SnmpConstants.version1;
@@ -203,7 +204,7 @@ public class SnmpPollingEndpoint extends
// check for valid response
if (event.getRequest() == null || event.getResponse() == null) {
// ignore null requests/responses
- LOG.debug("Received invalid snmp event. Request: " + event.getRequest() + " / Response: "
+ logger.debug("Received invalid snmp event. Request: " + event.getRequest() + " / Response: "
+ event.getResponse());
return;
}
@@ -239,7 +240,7 @@ public class SnmpPollingEndpoint extends
// and use send to deliver it
getChannel().send(io);
} catch (MessagingException ex) {
- LOG.error("Error while trying to send the snmp event to the jbi bus", ex);
+ logger.error("Error while trying to send the snmp event to the jbi bus", ex);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-truezip/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-truezip/pom.xml?rev=1067118&r1=1067117&r2=1067118&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-truezip/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-truezip/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>de.schlichtherle.io</groupId>
<artifactId>truezip</artifactId>
<version>${truezip.version}</version>