Updated Branches: refs/heads/master ce90dc846 -> e7423fb21
Fixed the Salesforce CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7423fb2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7423fb2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7423fb2 Branch: refs/heads/master Commit: e7423fb212a78851428737336501b441353f701a Parents: ce90dc8 Author: Willem Jiang <ningji...@apache.org> Authored: Wed Sep 4 10:07:17 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Wed Sep 4 10:07:17 2013 +0800 ---------------------------------------------------------------------- .../component/cxf/feature/CXFMessageDataFormatFeature.java | 2 ++ .../camel/component/cxf/wssecurity/camel/camel-context.xml | 4 ++-- .../camel/component/salesforce/internal/dto/PushTopic.java | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e7423fb2/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java index ad1147d..846564e 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java @@ -23,6 +23,7 @@ import java.util.Collection; import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; +import org.apache.camel.component.cxf.interceptors.SoapMessageRedirectInterceptor; import org.apache.cxf.Bus; import org.apache.cxf.binding.Binding; import org.apache.cxf.binding.soap.SoapBinding; @@ -85,6 +86,7 @@ public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature { ep.getInInterceptors().add(new SAAJInInterceptor()); SAAJOutInterceptor out = new SAAJOutInterceptor(); ep.getOutInterceptors().add(out); + ep.getOutInterceptors().add(new SoapMessageRedirectInterceptor()); ep.getOutInterceptors().add(new MessageModeOutInterceptor(out, ep.getBinding().getBindingInfo().getName())); fmt = SOAPMessage.class; } else { http://git-wip-us.apache.org/repos/asf/camel/blob/e7423fb2/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml index c8eb963..3bbdbff 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml @@ -68,9 +68,9 @@ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";> <route errorHandlerRef="noErrorHandler"> <from uri="cxf:bean:route" /> - <process ref="myProcessor" /> + <!-- process ref="myProcessor" /--> <to uri="cxf:bean:service"/> - <process ref="myProcessor" /> + <!-- process ref="myProcessor" /--> </route> </camelContext> http://git-wip-us.apache.org/repos/asf/camel/blob/e7423fb2/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java index 9eaeec8..17dbd98 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java @@ -23,11 +23,11 @@ import org.apache.camel.component.salesforce.api.PicklistEnumConverter; import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; import org.codehaus.jackson.annotate.JsonProperty; +//CHECKSTYLE:OFF /** * Salesforce DTO for SObject PushTopic */ @XStreamAlias("PushTopic") -//CHECKSTYLE:OFF public class PushTopic extends AbstractSObjectBase { // WARNING: these fields have case sensitive names, @@ -107,4 +107,5 @@ public class PushTopic extends AbstractSObjectBase { this.Description = description; } } -//CHECKSTYLE:ON \ No newline at end of file +//CHECKSTYLE:ON +
