Updated Branches: refs/heads/camel-2.12.x 7002c750d -> 812524a64 refs/heads/master 33e4d7e47 -> ae6a4c081
Fixed CS error of camel-cxf Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/95e17f68 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/95e17f68 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/95e17f68 Branch: refs/heads/master Commit: 95e17f68b8e6e9fadfae668281cd82173bb165f7 Parents: 33e4d7e Author: Willem Jiang <ningji...@apache.org> Authored: Wed Sep 11 10:47:08 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Wed Sep 11 10:48:00 2013 +0800 ---------------------------------------------------------------------- .../CxfMessageSoapHeaderOutInterceptor.java | 5 ++-- .../RawMessageWSDLGetInterceptor.java | 29 +++++++++++++++++--- .../RawMessageWSDLGetOutInterceptor.java | 11 +++++--- 3 files changed, 34 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/95e17f68/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java index d1b7874..b5708e8 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java @@ -17,14 +17,13 @@ package org.apache.camel.component.cxf.interceptors; +import javax.xml.soap.SOAPMessage; + import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; - -import javax.xml.soap.SOAPMessage; - public class CxfMessageSoapHeaderOutInterceptor extends AbstractPhaseInterceptor<SoapMessage> { public CxfMessageSoapHeaderOutInterceptor() { http://git-wip-us.apache.org/repos/asf/camel/blob/95e17f68/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java index 5e9ca39..41a30d1 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java @@ -1,20 +1,41 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.camel.component.cxf.interceptors; +import java.util.Iterator; +import java.util.Map; + +import org.w3c.dom.Document; + import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.common.util.UrlUtils; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.frontend.WSDLGetUtils; -import org.apache.cxf.interceptor.*; +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.interceptor.Interceptor; +import org.apache.cxf.interceptor.OutgoingChainInterceptor; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.service.model.EndpointInfo; -import org.w3c.dom.Document; -import java.util.Iterator; -import java.util.Map; /** * Just copy the from WSDLGetInterceptor to provide backward compatible support for 2.7.x http://git-wip-us.apache.org/repos/asf/camel/blob/95e17f68/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetOutInterceptor.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetOutInterceptor.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetOutInterceptor.java index 5c081bc..2d7c963 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetOutInterceptor.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetOutInterceptor.java @@ -16,16 +16,19 @@ */ package org.apache.camel.component.cxf.interceptors; +import java.io.OutputStream; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.w3c.dom.Document; + import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.staxutils.StaxUtils; -import org.w3c.dom.Document; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.io.OutputStream; public class RawMessageWSDLGetOutInterceptor extends AbstractPhaseInterceptor<Message> { public static final RawMessageWSDLGetOutInterceptor INSTANCE = new RawMessageWSDLGetOutInterceptor();
