You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/01/28 22:31:23 UTC
svn commit: r1439645 - in /camel/trunk:
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/
components/camel-mina2/src/test/java/org/apache/camel/component/mina2/
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cam...
Author: cmueller
Date: Mon Jan 28 21:31:22 2013
New Revision: 1439645
URL: http://svn.apache.org/viewvc?rev=1439645&view=rev
Log:
fixed the wrong usage of logging API's
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java
camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java?rev=1439645&r1=1439644&r2=1439645&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/MessageLossSimulator.java Mon Jan 28 21:31:22 2013
@@ -20,8 +20,6 @@ package org.apache.camel.component.cxf.w
import java.io.IOException;
import java.io.OutputStream;
import java.util.ListIterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.Interceptor;
@@ -35,12 +33,12 @@ import org.apache.cxf.phase.PhaseInterce
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.rm.RMContextUtils;
-/**
- *
- */
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
- private static final Logger LOG = Logger.getLogger(MessageLossSimulator.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(MessageLossSimulator.class.getName());
private int appMessageCount;
public MessageLossSimulator() {
@@ -73,7 +71,7 @@ public class MessageLossSimulator extend
PhaseInterceptor<?> pi = (PhaseInterceptor<?>)it.next();
if (MessageSenderInterceptor.class.getName().equals(pi.getId())) {
chain.remove(pi);
- LOG.fine("Removed MessageSenderInterceptor from interceptor chain.");
+ LOG.debug("Removed MessageSenderInterceptor from interceptor chain.");
break;
}
}
@@ -103,27 +101,19 @@ public class MessageLossSimulator extend
@Override
protected void onFirstWrite() throws IOException {
- if (LOG.isLoggable(Level.FINE)) {
- Long nr = RMContextUtils.retrieveRMProperties(outMessage, true)
- .getSequence().getMessageNumber();
- LOG.fine("Losing message " + nr);
+ if (LOG.isDebugEnabled()) {
+ Long nr = RMContextUtils.retrieveRMProperties(outMessage, true).getSequence().getMessageNumber();
+ LOG.debug("Losing message {}", nr);
}
wrappedStream = new DummyOutputStream();
}
}
-
-
private class DummyOutputStream extends OutputStream {
@Override
public void write(int b) throws IOException {
// TODO Auto-generated method stub
-
}
-
}
-
-
-
}
Modified: camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java?rev=1439645&r1=1439644&r2=1439645&view=diff
==============================================================================
--- camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java (original)
+++ camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java Mon Jan 28 21:31:22 2013
@@ -24,7 +24,6 @@ import java.net.InetSocketAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.nio.charset.Charset;
-import java.util.logging.Level;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
@@ -43,9 +42,6 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
-/**
- *
- */
public class Mina2UdpNoCamelTest {
private static Logger logger = LoggerFactory.getLogger(Mina2UdpNoCamelTest.class);
@@ -149,23 +145,18 @@ public class Mina2UdpNoCamelTest {
address = InetAddress.getByName(localHost);
} catch (UnknownHostException ex) {
- java.util.logging.Logger.getLogger(Mina2UdpNoCamelTest.class.getName()).log(
- Level.SEVERE, null, ex);
+ logger.warn(null, ex);
} catch (SocketException ex) {
- java.util.logging.Logger.getLogger(Mina2UdpNoCamelTest.class.getName()).log(
- Level.SEVERE, null, ex);
+ logger.warn(null, ex);
}
-
}
public void sendNoMina(String msg) {
try {
- DatagramPacket packet = new DatagramPacket(msg.getBytes(), msg.getBytes().length,
- address, localPort);
+ DatagramPacket packet = new DatagramPacket(msg.getBytes(), msg.getBytes().length, address, localPort);
socket.send(packet);
} catch (IOException ex) {
- java.util.logging.Logger.getLogger(Mina2UdpNoCamelTest.class.getName()).log(
- Level.SEVERE, null, ex);
+ logger.warn(null, ex);
}
}
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java?rev=1439645&r1=1439644&r2=1439645&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java Mon Jan 28 21:31:22 2013
@@ -16,11 +16,11 @@
*/
package org.apache.camel.example.camel.transport;
-import java.util.logging.Logger;
-
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@javax.jws.WebService(portName = "CamelPort", serviceName = "CamelService",
targetNamespace = "http://apache.org/hello_world_soap_http",
@@ -28,8 +28,7 @@ import org.apache.hello_world_soap_http.
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
- Logger.getLogger(GreeterImpl.class.getPackage().getName());
+ private static final Logger LOG = LoggerFactory.getLogger(GreeterImpl.class);
private String suffix;
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java?rev=1439645&r1=1439644&r2=1439645&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java Mon Jan 28 21:31:22 2013
@@ -16,11 +16,11 @@
*/
package org.apache.camel.example.cxf.httptojms;
-import java.util.logging.Logger;
-
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@javax.jws.WebService(portName = "SoapOverJms", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http",
@@ -29,8 +29,7 @@ import org.apache.hello_world_soap_http.
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
- Logger.getLogger(GreeterImpl.class.getPackage().getName());
+ private static final Logger LOG = LoggerFactory.getLogger(GreeterImpl.class);
public String greetMe(String me) {
LOG.info("Executing operation greetMe");
Modified: camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java?rev=1439645&r1=1439644&r2=1439645&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java (original)
+++ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java Mon Jan 28 21:31:22 2013
@@ -16,16 +16,17 @@
*/
package org.apache.camel.example.gae;
-import java.util.logging.Logger;
-
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathFactory;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ReportGenerator implements Processor {
- private static final Logger LOGGER = Logger.getLogger(RequestProcessor.class.getName());
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(RequestProcessor.class);
public void process(Exchange exchange) throws Exception {
ReportData data = exchange.getIn().getBody(ReportData.class);
Modified: camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java?rev=1439645&r1=1439644&r2=1439645&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java (original)
+++ camel/trunk/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java Mon Jan 28 21:31:22 2013
@@ -16,16 +16,16 @@
*/
package org.apache.camel.example.gae;
-import java.util.logging.Logger;
-
import com.google.appengine.api.users.UserService;
import com.google.appengine.api.users.UserServiceFactory;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RequestProcessor implements Processor {
- private static final Logger LOGGER = Logger.getLogger(RequestProcessor.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(RequestProcessor.class);
public void process(Exchange exchange) throws Exception {
UserService userService = UserServiceFactory.getUserService();