Author: ningjiang
Date: Sun Jun 8 01:32:29 2008
New Revision: 664468
URL: http://svn.apache.org/viewvc?rev=664468&view=rev
Log:
CAMEL-587 Using CXF LogUtils to get logger
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/AbstractMessageInInterceptor.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
Sun Jun 8 01:32:29 2008
@@ -24,6 +24,7 @@
import java.util.logging.Logger;
import org.apache.camel.ExchangePattern;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.helpers.CastUtils;
@@ -37,7 +38,7 @@
import org.apache.cxf.service.model.BindingOperationInfo;
public class CamelInvoker implements Invoker, MessageInvoker {
- private static final Logger LOG =
Logger.getLogger(CamelInvoker.class.getName());
+ private static final Logger LOG =
LogUtils.getL7dLogger(CamelInvoker.class);
private CxfConsumer cxfConsumer;
public CamelInvoker(CxfConsumer consumer) {
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Sun Jun 8 01:32:29 2008
@@ -37,7 +37,6 @@
private final String address;
private String wsdlURL;
private String serviceClass;
- private CxfBinding binding;
private String portName;
private String serviceName;
private String dataFormat;
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
Sun Jun 8 01:32:29 2008
@@ -34,7 +34,7 @@
* Message in PAYLOAD data format
*/
public class PayLoadDataFormatFeature extends AbstractDataFormatFeature {
- private static final Logger LOG =
LogUtils.getL7dLogger(MessageDataFormatFeature.class);
+ private static final Logger LOG =
LogUtils.getL7dLogger(PayLoadDataFormatFeature.class);
// filter the unused phase
private static final String[] REMOVING_IN_PHASES = {Phase.UNMARSHAL,
Phase.PRE_LOGICAL, Phase.PRE_LOGICAL_ENDING, Phase.POST_LOGICAL,
Phase.POST_LOGICAL_ENDING };
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/AbstractMessageInInterceptor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/AbstractMessageInInterceptor.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/AbstractMessageInInterceptor.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/AbstractMessageInInterceptor.java
Sun Jun 8 01:32:29 2008
@@ -46,9 +46,8 @@
* infers the BindingOperationInfo and then set the
*
*/
-public abstract class AbstractMessageInInterceptor<T extends Message>
+public abstract class AbstractMessageInInterceptor<T extends Message>
extends AbstractPhaseInterceptor<T> {
- private static final Logger LOG =
LogUtils.getL7dLogger(AbstractMessageInInterceptor.class);
public AbstractMessageInInterceptor(String phase) {
super(phase);
@@ -59,12 +58,12 @@
}
/**
- * Infer the OperationInfo from the XML Document and get the list of
+ * Infer the OperationInfo from the XML Document and get the list of
* parts as DOM Element
*/
public void handleMessage(T message) throws Fault {
Logger logger = getLogger();
-
+
if (isFaultMessage(message)) {
message.getInterceptorChain().abort();
Endpoint ep = message.getExchange().get(Endpoint.class);
@@ -80,7 +79,7 @@
Document document = createDOMMessage(message);
//Document document = message.getContent(Document.class);
Element payloadEl = (Element)document.getChildNodes().item(0);
-
+
Exchange ex = message.getExchange();
BindingOperationInfo boi = ex.get(BindingOperationInfo.class);
if (boi == null) {
@@ -94,30 +93,30 @@
if (logger.isLoggable(Level.INFO)) {
logger.info("AbstractRoutingMessageInInterceptor Infer
BindingOperationInfo.");
}
-
+
boi = getBindingOperation(message, document);
if (boi == null) {
QName startQName = new QName(payloadEl.getNamespaceURI(),
payloadEl.getLocalName());
-
+
throw new Fault(new org.apache.cxf.common.i18n.Message(
- "REQ_NOT_UNDERSTOOD", LOG, startQName));
+ "REQ_NOT_UNDERSTOOD", getLogger(),
startQName));
}
-
+
if (boi != null) {
ex.put(BindingOperationInfo.class, boi);
ex.put(OperationInfo.class, boi.getOperationInfo());
ex.setOneWay(boi.getOperationInfo().isOneWay());
if (logger.isLoggable(Level.INFO)) {
logger.info("DOMInInterceptor- BindingOperation is:" +
boi.getName());
- }
+ }
}
}
BindingMessageInfo bmi = isRequestor(message) ? boi.getOutput() :
boi.getInput();
- List<Element> partList = getPartList(message, payloadEl, bmi);
+ List<Element> partList = getPartList(message, payloadEl, bmi);
message.put(List.class, partList);
-
+
Element header = getHeader(message);
message.put(Element.class, header);
}
@@ -132,14 +131,14 @@
if (getLogger().isLoggable(Level.INFO)) {
getLogger().info("AbstractMessageInInterceptor Converting Stax
Stream to DOM");
}
- XMLStreamReader xsr = message.getContent(XMLStreamReader.class);
+ XMLStreamReader xsr = message.getContent(XMLStreamReader.class);
doc = StaxUtils.read(xsr);
} catch (XMLStreamException xe) {
- throw new Fault(new
org.apache.cxf.common.i18n.Message("STAX_READ_EXC", LOG), xe);
+ throw new Fault(new
org.apache.cxf.common.i18n.Message("STAX_READ_EXC", getLogger()), xe);
}
return doc;
}
-
+
protected abstract Logger getLogger();
/**
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java
Sun Jun 8 01:32:29 2008
@@ -21,6 +21,7 @@
import java.util.Map;
import java.util.logging.Logger;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
@@ -32,7 +33,7 @@
*/
public abstract class AbstractInvokingContext implements InvokingContext {
- private static final Logger LOG =
Logger.getLogger(AbstractInvokingContext.class.getName());
+ protected abstract Logger getLogger();
protected <T> T getResponseObject(Message inMessage, Map<String, Object>
responseContext,
Class <T> clazz) {
@@ -40,7 +41,7 @@
if (inMessage != null) {
if (null != responseContext) {
responseContext.putAll(inMessage);
- LOG.info("set responseContext to be" + responseContext);
+ getLogger().info("set responseContext to be" +
responseContext);
}
retval = inMessage.getContent(clazz);
}
@@ -68,7 +69,7 @@
}
}
buffer.append("\n--------------------------------------");
- LOG.info(buffer.toString());
+ getLogger().info(buffer.toString());
}
}
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
Sun Jun 8 01:32:29 2008
@@ -41,7 +41,7 @@
*/
public class CxfClient extends ClientImpl {
- private static final Logger LOG =
Logger.getLogger(CxfClient.class.getName());
+ private static final Logger LOG = LogUtils.getL7dLogger(CxfClient.class);
public CxfClient(Bus b, Endpoint e) {
super(b, e);
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java
Sun Jun 8 01:32:29 2008
@@ -23,13 +23,14 @@
import java.util.logging.Logger;
import org.w3c.dom.Element;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
public class PayloadInvokingContext extends AbstractInvokingContext {
- private static final Logger LOG =
Logger.getLogger(PayloadInvokingContext.class.getName());
+ private static final Logger LOG =
LogUtils.getL7dLogger(PayloadInvokingContext.class);
public PayloadInvokingContext() {
@@ -109,4 +110,9 @@
return contents;
}
+ @Override
+ protected Logger getLogger() {
+ return LOG;
+ }
+
}
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java?rev=664468&r1=664467&r2=664468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java
Sun Jun 8 01:32:29 2008
@@ -23,11 +23,12 @@
import java.util.Set;
import java.util.logging.Logger;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
public class RawMessageInvokingContext extends AbstractInvokingContext {
- private static final Logger LOG =
Logger.getLogger(RawMessageInvokingContext.class.getName());
+ private static final Logger LOG =
LogUtils.getL7dLogger(RawMessageInvokingContext.class);
public RawMessageInvokingContext() {
@@ -72,4 +73,9 @@
return contents;
}
+ @Override
+ protected Logger getLogger() {
+ return LOG;
+ }
+
}
