Author: joed
Date: Sun Feb 6 20:59:30 2011
New Revision: 1067758
URL: http://svn.apache.org/viewvc?rev=1067758&view=rev
Log:
CAMEL-3628 - Patch thanks to Tracy Snell.
4 Classes still use j.u.l.
Tested in Junit and deployment to a SMX container. Imports for slf4j are 1.5
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
Sun Feb 6 20:59:30 2011
@@ -19,12 +19,12 @@ package org.apache.camel.component.cxf.f
import java.util.Collection;
import java.util.List;
-import java.util.logging.Logger;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
+import org.slf4j.Logger;
/**
* The abstract class for the data format feature
@@ -32,11 +32,11 @@ import org.apache.cxf.phase.PhaseInterce
public abstract class AbstractDataFormatFeature extends AbstractFeature {
protected abstract Logger getLogger();
-
+
protected void removeInterceptorWhichIsInThePhases(List<Interceptor<?
extends Message>> interceptors, String[] phaseNames) {
for (Interceptor i : interceptors) {
if (i instanceof PhaseInterceptor) {
- PhaseInterceptor p = (PhaseInterceptor)i;
+ PhaseInterceptor p = (PhaseInterceptor) i;
for (String phaseName : phaseNames) {
if (p.getPhase().equals(phaseName)) {
getLogger().info("removing the interceptor " + p);
@@ -52,7 +52,7 @@ public abstract class AbstractDataFormat
for (Interceptor i : interceptors) {
boolean outside = false;
if (i instanceof PhaseInterceptor) {
- PhaseInterceptor p = (PhaseInterceptor)i;
+ PhaseInterceptor p = (PhaseInterceptor) i;
for (String phaseName : phaseNames) {
if (p.getPhase().equals(phaseName)) {
outside = true;
@@ -66,10 +66,8 @@ public abstract class AbstractDataFormat
}
}
}
-
-
- protected void removeInterceptors(List<Interceptor<? extends Message>>
interceptors,
- Collection<Class>
toBeRemovedInterceptors) {
+
+ protected void removeInterceptors(List<Interceptor<? extends Message>>
interceptors, Collection<Class> toBeRemovedInterceptors) {
for (Interceptor interceptor : interceptors) {
if (toBeRemovedInterceptors.contains(interceptor.getClass())) {
getLogger().info("removing the interceptor " + interceptor);
@@ -77,5 +75,4 @@ public abstract class AbstractDataFormat
}
}
}
-
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
Sun Feb 6 20:59:30 2011
@@ -17,19 +17,18 @@
package org.apache.camel.component.cxf.feature;
-import java.util.logging.Logger;
-
import
org.apache.camel.component.cxf.interceptors.RawMessageContentRedirectInterceptor;
import org.apache.cxf.Bus;
-import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.phase.Phase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * <p>
+ * <p>
* MessageDataFormatFeature sets up the CXF endpoint interceptor for handling
the
- * Message in Message data format. Only the interceptors of these phases are
+ * Message in Message data format. Only the interceptors of these phases are
* <b>preserved</b>:
* </p>
* <p>
@@ -40,10 +39,10 @@ import org.apache.cxf.phase.Phase;
* </p>
*/
public class MessageDataFormatFeature extends AbstractDataFormatFeature {
-
- private static final Logger LOG =
LogUtils.getL7dLogger(MessageDataFormatFeature.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(MessageDataFormatFeature.class);
+
// filter the unused in phase interceptor
- private static final String[] REMAINING_IN_PHASES = {Phase.RECEIVE ,
Phase.USER_STREAM,
+ private static final String[] REMAINING_IN_PHASES = {Phase.RECEIVE,
Phase.USER_STREAM,
Phase.INVOKE, Phase.POST_INVOKE};
// filter the unused in phase interceptor
private static final String[] REMAINING_OUT_PHASES = {Phase.PREPARE_SEND,
Phase.USER_STREAM,
@@ -68,15 +67,15 @@ public class MessageDataFormatFeature ex
// remove the interceptors
removeInterceptorWhichIsOutThePhases(server.getEndpoint().getService().getInInterceptors(),
REMAINING_IN_PHASES);
removeInterceptorWhichIsOutThePhases(server.getEndpoint().getInInterceptors(),
REMAINING_IN_PHASES);
-
+
// Do not using the binding interceptor any more
server.getEndpoint().getBinding().getInInterceptors().clear();
removeInterceptorWhichIsOutThePhases(server.getEndpoint().getService().getOutInterceptors(),
REMAINING_OUT_PHASES);
removeInterceptorWhichIsOutThePhases(server.getEndpoint().getOutInterceptors(),
REMAINING_OUT_PHASES);
-
+
// Do not use the binding interceptor any more
- server.getEndpoint().getBinding().getOutInterceptors().clear();
+ server.getEndpoint().getBinding().getOutInterceptors().clear();
server.getEndpoint().getOutInterceptors().add(new
RawMessageContentRedirectInterceptor());
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
Sun Feb 6 20:59:30 2011
@@ -18,29 +18,30 @@ package org.apache.camel.component.cxf.f
import java.util.ArrayList;
import java.util.Collection;
-import java.util.logging.Logger;
+
import
org.apache.camel.component.cxf.interceptors.ConfigureDocLitWrapperInterceptor;
import org.apache.camel.component.cxf.interceptors.RemoveClassTypeInterceptor;
import org.apache.cxf.Bus;
-import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.ClientFaultConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This feature just setting up the CXF endpoint interceptor for handling the
* Message in PAYLOAD data format
*/
public class PayLoadDataFormatFeature extends AbstractDataFormatFeature {
- private static final Logger LOG =
LogUtils.getL7dLogger(PayLoadDataFormatFeature.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(PayLoadDataFormatFeature.class);
private static final Collection<Class> REMOVING_FAULT_IN_INTERCEPTORS;
static {
REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<Class>();
REMOVING_FAULT_IN_INTERCEPTORS.add(ClientFaultConverter.class);
}
-
+
@Override
public void initialize(Client client, Bus bus) {
removeFaultInInterceptorFromClient(client);
@@ -49,7 +50,7 @@ public class PayLoadDataFormatFeature ex
}
@Override
- public void initialize(Server server, Bus bus) {
+ public void initialize(Server server, Bus bus) {
server.getEndpoint().getBinding().getInInterceptors().add(new
ConfigureDocLitWrapperInterceptor(true));
server.getEndpoint().getBinding().getInInterceptors().add(new
RemoveClassTypeInterceptor());
}
@@ -58,12 +59,12 @@ public class PayLoadDataFormatFeature ex
protected Logger getLogger() {
return LOG;
}
-
+
private void removeFaultInInterceptorFromClient(Client client) {
removeInterceptors(client.getInFaultInterceptors(),
REMOVING_FAULT_IN_INTERCEPTORS);
removeInterceptors(client.getEndpoint().getService().getInFaultInterceptors(),
REMOVING_FAULT_IN_INTERCEPTORS);
removeInterceptors(client.getEndpoint().getInFaultInterceptors(),
REMOVING_FAULT_IN_INTERCEPTORS);
-
removeInterceptors(client.getEndpoint().getBinding().getInFaultInterceptors(),
REMOVING_FAULT_IN_INTERCEPTORS);
+
removeInterceptors(client.getEndpoint().getBinding().getInFaultInterceptors(),
REMOVING_FAULT_IN_INTERCEPTORS);
}
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
Sun Feb 6 20:59:30 2011
@@ -18,8 +18,6 @@ package org.apache.camel.component.cxf.t
import java.io.IOException;
import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -45,13 +43,18 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class CamelConduit extends AbstractConduit implements Configurable {
protected static final String BASE_BEAN_NAME_SUFFIX = ".camel-conduit";
- private static final Logger LOG =
LogUtils.getL7dLogger(CamelConduit.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CamelConduit.class);
+ // used for places where CXF requires JUL
+ private static final java.util.logging.Logger JUL_LOG =
LogUtils.getL7dLogger(CamelConduit.class);
+
private CamelContext camelContext;
private EndpointInfo endpointInfo;
private String targetCamelEndpointUri;
@@ -98,7 +101,7 @@ public class CamelConduit extends Abstra
public CamelContext getCamelContext() {
if (camelContext == null) {
- getLogger().log(Level.INFO, "No CamelContext injected, create a
default one");
+ LOG.info("No CamelContext injected, create a default one");
camelContext = new DefaultCamelContext();
}
return camelContext;
@@ -106,22 +109,22 @@ public class CamelConduit extends Abstra
// prepare the message for send out , not actually send out the message
public void prepare(Message message) throws IOException {
- getLogger().log(Level.FINE, "CamelConduit send message");
+ LOG.trace("CamelConduit send message");
message.setContent(OutputStream.class, new CamelOutputStream(message));
}
public void close() {
- getLogger().log(Level.FINE, "CamelConduit closed ");
+ LOG.trace("CamelConduit closed ");
// shutdown the producer
try {
producer.stop();
} catch (Exception e) {
- getLogger().log(Level.WARNING, "CamelConduit producer stop with
the exception", e);
+ LOG.warn("CamelConduit producer stop with the exception", e);
}
}
- protected Logger getLogger() {
- return LOG;
+ protected java.util.logging.Logger getLogger() {
+ return JUL_LOG;
}
public String getBeanName() {
@@ -143,7 +146,7 @@ public class CamelConduit extends Abstra
@Deprecated
public ProducerTemplate getCamelTemplate() throws Exception {
- if (camelTemplate == null) {
+ if (camelTemplate == null) {
camelTemplate = getCamelContext().createProducerTemplate();
}
return camelTemplate;
@@ -183,25 +186,27 @@ public class CamelConduit extends Abstra
} else {
pattern = ExchangePattern.InOut;
}
- getLogger().log(Level.FINE, "send the message to endpoint" +
targetCamelEndpointUri);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("send the message to endpoint" +
targetCamelEndpointUri);
+ }
org.apache.camel.Exchange exchange =
producer.createExchange(pattern);
-
+
exchange.setProperty(Exchange.TO_ENDPOINT, targetCamelEndpointUri);
- CachedOutputStream outputStream =
(CachedOutputStream)outMessage.getContent(OutputStream.class);
+ CachedOutputStream outputStream = (CachedOutputStream)
outMessage.getContent(OutputStream.class);
// Send out the request message here, copy the protocolHeader back
CxfHeaderHelper.propagateCxfToCamel(headerFilterStrategy,
outMessage, exchange.getIn().getHeaders(), exchange);
// TODO support different encoding
exchange.getIn().setBody(outputStream.getBytes());
- getLogger().log(Level.FINE, "template sending request: ",
exchange.getIn());
+ LOG.debug("template sending request: ", exchange.getIn());
Exception exception;
try {
producer.process(exchange);
} catch (Exception ex) {
- exception = ex;
+ exception = ex;
}
// Throw the exception that the template get
- exception = exchange.getException();
+ exception = exchange.getException();
if (exception != null) {
throw new IOException("Cannot send the request message.",
exchange.getException());
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
Sun Feb 6 20:59:30 2011
@@ -18,8 +18,7 @@ package org.apache.camel.component.cxf.t
import java.io.IOException;
import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
@@ -48,15 +47,19 @@ import org.apache.cxf.transport.ConduitI
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
- *
+ *
* Forwards messages from Camel to CXF and the CXF response back to Camel
*/
public class CamelDestination extends AbstractDestination implements
Configurable {
protected static final String BASE_BEAN_NAME_SUFFIX = ".camel-destination";
- private static final Logger LOG =
LogUtils.getL7dLogger(CamelDestination.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CamelDestination.class);
+ // used for places where CXF requires JUL
+ private static final java.util.logging.Logger JUL_LOG =
LogUtils.getL7dLogger(CamelDestination.class);
final ConduitInitiator conduitInitiator;
CamelContext camelContext;
Consumer consumer;
@@ -69,9 +72,9 @@ public class CamelDestination extends Ab
public CamelDestination(CamelContext camelContext, Bus bus,
ConduitInitiator ci, EndpointInfo info) throws IOException {
this(camelContext, bus, ci, info, null, false);
}
-
+
public CamelDestination(CamelContext camelContext, Bus bus,
ConduitInitiator ci, EndpointInfo info,
- HeaderFilterStrategy headerFilterStrategy, boolean checkException)
throws IOException {
+ HeaderFilterStrategy headerFilterStrategy, boolean
checkException) throws IOException {
super(bus, getTargetReference(info, bus), info);
this.camelContext = camelContext;
conduitInitiator = ci;
@@ -84,8 +87,8 @@ public class CamelDestination extends Ab
this.checkException = checkException;
}
- protected Logger getLogger() {
- return LOG;
+ protected java.util.logging.Logger getLogger() {
+ return JUL_LOG;
}
public void setCheckException(boolean exception) {
@@ -95,6 +98,7 @@ public class CamelDestination extends Ab
public boolean isCheckException() {
return checkException;
}
+
/**
* @param inMessage the incoming message
* @return the inbuilt backchannel
@@ -105,10 +109,10 @@ public class CamelDestination extends Ab
}
public void activate() {
- getLogger().log(Level.FINE, "CamelDestination activate().... ");
+ LOG.debug("CamelDestination activate().... ");
ObjectHelper.notNull(camelContext, "CamelContext", this);
try {
- getLogger().log(Level.FINE, "establishing Camel connection");
+ LOG.debug("establishing Camel connection");
destinationEndpoint =
getCamelContext().getEndpoint(camelDestinationUri);
consumer = destinationEndpoint.createConsumer(new
ConsumerProcessor());
ServiceHelper.startService(consumer);
@@ -121,12 +125,12 @@ public class CamelDestination extends Ab
try {
ServiceHelper.stopService(consumer);
} catch (Exception e) {
- getLogger().log(Level.WARNING, "Error stopping consumer", e);
+ LOG.warn("Error stopping consumer", e);
}
}
public void shutdown() {
- getLogger().log(Level.FINE, "CamelDestination shutdown()");
+ LOG.debug("CamelDestination shutdown()");
this.deactivate();
}
@@ -139,13 +143,13 @@ public class CamelDestination extends Ab
}
protected void incoming(org.apache.camel.Exchange camelExchange) {
- getLogger().log(Level.FINE, "server received request: ",
camelExchange);
+ LOG.debug("server received request: ", camelExchange);
DefaultCxfBeanBinding beanBinding = new DefaultCxfBeanBinding();
- org.apache.cxf.message.Message inMessage =
+ org.apache.cxf.message.Message inMessage =
beanBinding.createCxfMessageFromCamelExchange(camelExchange,
headerFilterStrategy);
inMessage.put(CxfConstants.CAMEL_EXCHANGE, camelExchange);
- ((MessageImpl)inMessage).setDestination(this);
+ ((MessageImpl) inMessage).setDestination(this);
// Handling the incoming message
// The response message will be send back by the outgoing chain
@@ -158,7 +162,7 @@ public class CamelDestination extends Ab
}
return endpointInfo.getName().toString() + BASE_BEAN_NAME_SUFFIX;
}
-
+
public String getCamelDestinationUri() {
return camelDestinationUri;
}
@@ -188,6 +192,7 @@ public class CamelDestination extends Ab
protected Message inMessage;
Exchange camelExchange;
org.apache.cxf.message.Exchange cxfExchange;
+
BackChannelConduit(Message message) {
super(EndpointReferenceUtils.getAnonymousEndpointReference());
inMessage = message;
@@ -215,8 +220,8 @@ public class CamelDestination extends Ab
message.setContent(OutputStream.class, new
CamelOutputStream(message));
}
- protected Logger getLogger() {
- return LOG;
+ protected java.util.logging.Logger getLogger() {
+ return JUL_LOG;
}
}
@@ -241,8 +246,8 @@ public class CamelDestination extends Ab
}
protected void propagateResponseHeadersToCamel(Message outMessage,
Exchange camelExchange) {
- CxfHeaderHelper.propagateCxfToCamel(headerFilterStrategy, outMessage,
-
camelExchange.getOut().getHeaders(), camelExchange);
+ CxfHeaderHelper.propagateCxfToCamel(headerFilterStrategy, outMessage,
+
camelExchange.getOut().getHeaders(), camelExchange);
}
/**
@@ -259,18 +264,20 @@ public class CamelDestination extends Ab
// Prepare the message and get the send out message
private void commitOutputMessage() throws IOException {
Exchange camelExchange =
(Exchange)outMessage.get(CxfConstants.CAMEL_EXCHANGE);
-
+
propagateResponseHeadersToCamel(outMessage, camelExchange);
-
+
// check if the outMessage has the exception
Exception exception = outMessage.getContent(Exception.class);
if (checkException && exception != null) {
camelExchange.setException(exception);
}
-
+
CachedOutputStream outputStream =
(CachedOutputStream)outMessage.getContent(OutputStream.class);
camelExchange.getOut().setBody(outputStream.getBytes());
- getLogger().log(Level.FINE, "send the response message: " +
outputStream);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("send the response message: " + outputStream);
+ }
}
@Override
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
Sun Feb 6 20:59:30 2011
@@ -33,7 +33,8 @@ import org.apache.cxf.staxutils.DepthXML
import org.apache.cxf.staxutils.StaxUtils;
public class DataInInterceptor extends AbstractInDatabindingInterceptor {
- private static final Logger LOG =
LogUtils.getL7dLogger(DataInInterceptor.class);
+ // CXF requires JUL for Message
+ private static final Logger JUL_LOG =
LogUtils.getL7dLogger(DataInInterceptor.class);
public DataInInterceptor() {
super(Phase.UNMARSHAL);
@@ -46,7 +47,7 @@ public class DataInInterceptor extends A
Document doc = StaxUtils.read(xmlReader);
message.setContent(Source.class, new DOMSource(doc));
} catch (XMLStreamException e) {
- throw new Fault(new
org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION", LOG), e);
+ throw new Fault(new
org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION", JUL_LOG), e);
}
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java
Sun Feb 6 20:59:30 2011
@@ -31,7 +31,8 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.StaxUtils;
public class DataOutInterceptor extends AbstractOutDatabindingInterceptor {
- private static final Logger LOG =
LogUtils.getL7dLogger(DataOutInterceptor.class);
+ // CXF requires java.util.logging for Message
+ private static final Logger JUL_LOG =
LogUtils.getL7dLogger(DataOutInterceptor.class);
public DataOutInterceptor() {
super(Phase.MARSHAL);
@@ -47,7 +48,7 @@ public class DataOutInterceptor extends
StaxUtils.copy(xmlReader, xmlWriter);
}
} catch (XMLStreamException e) {
- throw new Fault(new
org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION", LOG, e), e);
+ throw new Fault(new
org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION", JUL_LOG, e), e);
}
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java?rev=1067758&r1=1067757&r2=1067758&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java
Sun Feb 6 20:59:30 2011
@@ -17,12 +17,13 @@
package org.apache.camel.component.cxf;
import java.util.List;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HelloServiceImpl implements HelloService {
- private static final Logger LOG =
Logger.getLogger(HelloServiceImpl.class.getName());
+ private static final Logger LOG =
LoggerFactory.getLogger(HelloServiceImpl.class);
private int invocationCount;
public String echo(String text) {
