You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/03 19:28:16 UTC
svn commit: r1499490 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/interceptor/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/
rt/bindings/soap/src/main/java/org/apache/cxf/...
Author: dkulp
Date: Wed Jul 3 17:28:15 2013
New Revision: 1499490
URL: http://svn.apache.org/r1499490
Log:
Move some WSDL services only interceptors out of API.
Added:
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java
- copied, changed from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
- copied, changed from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java
- copied, changed from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
- copied, changed from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/Messages.properties
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java
- copied, changed from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java
- copied, changed from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java
cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/
cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
- copied, changed from r1499424, cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/
cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/
cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/
cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/docLitWrappedReq.xml
- copied, changed from r1499424, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/docLitWrappedReq.xml
cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/multiPartDocLitBareReq.xml
- copied, changed from r1499424, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/multiPartDocLitBareReq.xml
Removed:
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/docLitWrappedReq.xml
cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/multiPartDocLitBareReq.xml
Modified:
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java Wed Jul 3 17:28:15 2013
@@ -20,7 +20,6 @@
package org.apache.cxf.binding.corba;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -34,8 +33,6 @@ import org.apache.cxf.binding.corba.inte
import org.apache.cxf.binding.corba.interceptors.CorbaStreamInInterceptor;
import org.apache.cxf.binding.corba.interceptors.CorbaStreamOutInterceptor;
import org.apache.cxf.binding.corba.utils.OrbConfig;
-import org.apache.cxf.interceptor.BareInInterceptor;
-import org.apache.cxf.interceptor.BareOutInterceptor;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Conduit;
@@ -44,6 +41,8 @@ import org.apache.cxf.transport.Destinat
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.binding.AbstractWSDLBindingFactory;
+import org.apache.cxf.wsdl.interceptors.BareInInterceptor;
+import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
public class CorbaBindingFactory extends AbstractWSDLBindingFactory
implements ConduitInitiator, DestinationFactory {
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Wed Jul 3 17:28:15 2013
@@ -20,7 +20,6 @@
package org.apache.cxf.binding.soap;
import java.util.ArrayList;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@@ -81,13 +80,10 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.interceptor.AttachmentInInterceptor;
import org.apache.cxf.interceptor.AttachmentOutInterceptor;
-import org.apache.cxf.interceptor.BareOutInterceptor;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.interceptor.StaxInInterceptor;
import org.apache.cxf.interceptor.StaxOutInterceptor;
-import org.apache.cxf.interceptor.WrappedOutInterceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.model.BindingFaultInfo;
@@ -108,6 +104,9 @@ import org.apache.cxf.ws.addressing.Cont
import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl.binding.AbstractWSDLBindingFactory;
+import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
+import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
+import org.apache.cxf.wsdl.interceptors.WrappedOutInterceptor;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import static org.apache.cxf.helpers.CastUtils.cast;
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java Wed Jul 3 17:28:15 2013
@@ -24,11 +24,11 @@ import org.apache.cxf.binding.soap.SoapM
import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.binding.soap.model.SoapBindingInfo;
import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.interceptor.AbstractEndpointSelectionInterceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.wsdl.interceptors.AbstractEndpointSelectionInterceptor;
/**
* Selects the most appropriate endpoint based on the SOAP version used.
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java Wed Jul 3 17:28:15 2013
@@ -34,9 +34,7 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
-import org.apache.cxf.interceptor.BareInInterceptor;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
@@ -51,6 +49,8 @@ import org.apache.cxf.service.model.Serv
import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.BareInInterceptor;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
private static final QName SOAP12_RESULT = new QName("http://www.w3.org/2003/05/soap-rpc",
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java Wed Jul 3 17:28:15 2013
@@ -44,8 +44,6 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.ServiceUtils;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
-import org.apache.cxf.interceptor.BareInInterceptor;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -58,6 +56,8 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.staxutils.W3CDOMStreamReader;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
+import org.apache.cxf.wsdl.interceptors.BareInInterceptor;
+import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
/**
* Perform databinding of the SOAP headers.
Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java Wed Jul 3 17:28:15 2013
@@ -23,7 +23,6 @@ import java.util.Collection;
import javax.xml.namespace.QName;
-
import org.apache.cxf.Bus;
import org.apache.cxf.binding.AbstractBindingFactory;
import org.apache.cxf.binding.Binding;
@@ -34,16 +33,16 @@ import org.apache.cxf.binding.xml.interc
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.interceptor.AttachmentInInterceptor;
import org.apache.cxf.interceptor.AttachmentOutInterceptor;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
import org.apache.cxf.interceptor.StaxInInterceptor;
import org.apache.cxf.interceptor.StaxOutInterceptor;
-import org.apache.cxf.interceptor.WrappedOutInterceptor;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
+import org.apache.cxf.wsdl.interceptors.WrappedOutInterceptor;
@NoJSR250Annotations(unlessNull = { "bus" })
public class XMLBindingFactory extends AbstractBindingFactory {
Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java Wed Jul 3 17:28:15 2013
@@ -31,7 +31,6 @@ import org.apache.cxf.bindings.xformat.X
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -43,6 +42,7 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(XMLMessageInInterceptor.class);
Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java Wed Jul 3 17:28:15 2013
@@ -29,15 +29,15 @@ import org.apache.cxf.bindings.xformat.X
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
-import org.apache.cxf.interceptor.BareOutInterceptor;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.WrappedOutInterceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
+import org.apache.cxf.wsdl.interceptors.WrappedOutInterceptor;
public class XMLMessageOutInterceptor extends AbstractOutDatabindingInterceptor {
Modified: cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java (original)
+++ cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java Wed Jul 3 17:28:15 2013
@@ -35,6 +35,7 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_xml_http.bare.types.MyComplexStructType;
+
import org.junit.Test;
public class XMLFaultInterceptorsTest extends TestBase {
Modified: cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java Wed Jul 3 17:28:15 2013
@@ -25,11 +25,12 @@ import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
import org.apache.hello_world_xml_http.bare.types.MyComplexStructType;
import org.apache.hello_world_xml_http.wrapped.types.GreetMe;
+
import org.junit.Before;
import org.junit.Test;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java Wed Jul 3 17:28:15 2013
@@ -18,17 +18,16 @@
*/
package org.apache.cxf.databinding.stax;
+import java.util.LinkedList;
import java.util.List;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.interceptor.BareInInterceptor;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
+import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.PhaseInterceptor;
public class StaxDataBindingFeature extends AbstractFeature {
@@ -44,25 +43,13 @@ public class StaxDataBindingFeature exte
}
private void removeDatabindingInterceptor(List<Interceptor<? extends Message>> inInterceptors) {
- removeInterceptor(inInterceptors, DocLiteralInInterceptor.class.getName());
- removeInterceptor(inInterceptors, BareInInterceptor.class.getName());
-
-
- inInterceptors.add(new StaxDataBindingInterceptor());
- }
-
- private void removeInterceptor(List<Interceptor<? extends Message>> inInterceptors, String name) {
-
+ List<Interceptor<? extends Message>> remove = new LinkedList<Interceptor<? extends Message>>();
for (Interceptor<? extends Message> i : inInterceptors) {
- if (i instanceof PhaseInterceptor) {
- PhaseInterceptor<? extends Message> p = (PhaseInterceptor<? extends Message>)i;
-
- if (p.getId().equals(name)) {
- inInterceptors.remove(p);
- return;
- }
+ if (i instanceof AbstractInDatabindingInterceptor) {
+ remove.add(i);
}
}
+ inInterceptors.removeAll(remove);
+ inInterceptors.add(new StaxDataBindingInterceptor());
}
-
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java Wed Jul 3 17:28:15 2013
@@ -28,8 +28,6 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
@@ -39,11 +37,10 @@ import org.apache.cxf.staxutils.DepthXML
import org.apache.cxf.staxutils.StaxUtils;
public class StaxDataBindingInterceptor extends AbstractInDatabindingInterceptor {
- private static final Logger LOG = LogUtils.getL7dLogger(DocLiteralInInterceptor.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(StaxDataBindingInterceptor.class);
public StaxDataBindingInterceptor() {
super(Phase.UNMARSHAL);
- addAfter(URIMappingInterceptor.class.getName());
}
public void handleMessage(Message message) {
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java Wed Jul 3 17:28:15 2013
@@ -34,12 +34,12 @@ import org.apache.cxf.aegis.services.Ech
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.test.XPathAssert;
import org.apache.cxf.testutil.common.TestUtil;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java Wed Jul 3 17:28:15 2013
@@ -30,7 +30,6 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.Binding;
@@ -38,7 +37,6 @@ import org.apache.cxf.binding.BindingFac
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.interceptor.BareInInterceptor;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -51,16 +49,17 @@ import org.apache.cxf.service.model.Bind
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.BareInInterceptor;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.easymock.IMocksControl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.expect;
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java Wed Jul 3 17:28:15 2013
@@ -28,16 +28,17 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.cxf.interceptor.BareOutInterceptor;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java Wed Jul 3 17:28:15 2013
@@ -30,7 +30,6 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.Binding;
@@ -38,7 +37,6 @@ import org.apache.cxf.binding.BindingFac
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.interceptor.DocLiteralInInterceptor;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -50,11 +48,13 @@ import org.apache.cxf.service.model.Bind
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.easymock.IMocksControl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java Wed Jul 3 17:28:15 2013
@@ -30,7 +30,6 @@ import org.apache.cxf.calculator.Calcula
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointImpl;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -41,6 +40,7 @@ import org.apache.cxf.service.invoker.Be
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.junit.Before;
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java Wed Jul 3 17:28:15 2013
@@ -29,7 +29,6 @@ import org.apache.cxf.binding.soap.SoapB
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointImpl;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -40,8 +39,10 @@ import org.apache.cxf.service.invoker.Be
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
+
import org.junit.Before;
import org.junit.Test;
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Wed Jul 3 17:28:15 2013
@@ -47,7 +47,6 @@ import org.apache.cxf.binding.soap.inter
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.headers.Header;
-import org.apache.cxf.interceptor.BareInInterceptor;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.InterceptorChain;
@@ -80,6 +79,7 @@ import org.apache.cxf.ws.rm.RMProperties
import org.apache.cxf.ws.rm.SequenceFault;
import org.apache.cxf.ws.rm.v200702.AckRequestedType;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
+import org.apache.cxf.wsdl.interceptors.BareInInterceptor;
/**
* Protocol Handler responsible for {en|de}coding the RM
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Wed Jul 3 17:28:15 2013
@@ -57,7 +57,6 @@ import org.apache.cxf.common.security.Si
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.interceptor.security.DefaultSecurityContext;
import org.apache.cxf.interceptor.security.RolePrefixSecurityContextImpl;
import org.apache.cxf.interceptor.security.SAMLSecurityContext;
@@ -69,6 +68,7 @@ import org.apache.cxf.staxutils.StaxUtil
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.apache.wss4j.common.cache.ReplayCache;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.ext.WSPasswordCallback;
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java Wed Jul 3 17:28:15 2013
@@ -39,12 +39,12 @@ import org.apache.cxf.common.i18n.Messag
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.StaxInInterceptor;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.cache.ReplayCache;
import org.apache.wss4j.common.crypto.Crypto;
Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java (from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java Wed Jul 3 17:28:15 2013
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.interceptor;
+package org.apache.cxf.wsdl.interceptors;
import java.util.Set;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java (from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java Wed Jul 3 17:28:15 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.interceptor;
+package org.apache.cxf.wsdl.interceptors;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,6 +32,8 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java (from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java Wed Jul 3 17:28:15 2013
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.cxf.interceptor;
+package org.apache.cxf.wsdl.interceptors;
import java.util.List;
+import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java (from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java Wed Jul 3 17:28:15 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.interceptor;
+package org.apache.cxf.wsdl.interceptors;
import java.util.ArrayList;
import java.util.Collection;
@@ -33,6 +33,8 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.common.util.XMLSchemaQNames;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
Added: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/Messages.properties?rev=1499490&view=auto
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/Messages.properties (added)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/Messages.properties Wed Jul 3 17:28:15 2013
@@ -0,0 +1,27 @@
+#
+#
+# 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.
+#
+#
+ORDERED_PARAM_REQUIRED=Parameter should be ordered in the following sequence: {0}
+STAX_WRITE_EXC = Could not write to XMLStreamWriter.
+NO_OPERATION_PATH=No such operation: {0} (HTTP GET PATH_INFO: {1})
+NO_PART_FOUND=Message part {0} was not recognized. (Does it exist in service WSDL?)
+UNEXPECTED_WRAPPER_ELEMENT = Unexpected wrapper element {0} found. Expected {1}.
+UNEXPECTED_ELEMENT = Unexpected element {0} found. Expected {1}.
+
Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java (from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java Wed Jul 3 17:28:15 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.interceptor;
+package org.apache.cxf.wsdl.interceptors;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
@@ -42,6 +42,8 @@ import org.apache.cxf.common.util.Primit
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.util.XMLSchemaQNames;
import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java (from r1499424, cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java Wed Jul 3 17:28:15 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.interceptor;
+package org.apache.cxf.wsdl.interceptors;
import java.util.ResourceBundle;
@@ -27,6 +27,8 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java (from r1499424, cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java (original)
+++ cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java Wed Jul 3 17:28:15 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.interceptor;
+package org.apache.cxf.wsdl.interceptors;
import java.net.URI;
import java.util.ArrayList;
@@ -52,6 +52,7 @@ import org.apache.cxf.staxutils.PartialX
import org.apache.cxf.staxutils.StaxUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/docLitWrappedReq.xml (from r1499424, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/docLitWrappedReq.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/docLitWrappedReq.xml?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/docLitWrappedReq.xml&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/docLitWrappedReq.xml&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
(empty)
Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/multiPartDocLitBareReq.xml (from r1499424, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/multiPartDocLitBareReq.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/multiPartDocLitBareReq.xml?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl/interceptors/resources/multiPartDocLitBareReq.xml&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/multiPartDocLitBareReq.xml&r1=1499424&r2=1499490&rev=1499490&view=diff
==============================================================================
(empty)
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java Wed Jul 3 17:28:15 2013
@@ -29,10 +29,10 @@ import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Endpoint;
import org.apache.cxf.annotations.UseAsyncMethod;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.ServerAsyncResponse;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.apache.hello_world_soap_http.BaseGreeterImpl;
import org.apache.hello_world_soap_http.DocLitBareGreeterImpl;
import org.apache.hello_world_soap_http.GreeterImpl;
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerGreeterNoWsdl.java Wed Jul 3 17:28:15 2013
@@ -26,9 +26,9 @@ import javax.xml.ws.Endpoint;
import org.apache.cxf.frontend.WSDLGetUtils;
import org.apache.cxf.greeter_control.GreeterImplNoWsdl;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
public class ServerGreeterNoWsdl extends AbstractBusTestServerBase {
static final String PORT = allocatePort(ServerGreeterNoWsdl.class);
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java Wed Jul 3 17:28:15 2013
@@ -26,7 +26,6 @@ import javax.xml.ws.Endpoint;
import org.apache.cxf.anonymous_complex_type.AnonymousComplexTypeImpl;
import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxb_element_test.JaxbElementTestImpl;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.JAXWSMethodInvoker;
@@ -38,6 +37,7 @@ import org.apache.cxf.service.invoker.Po
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.systest.jaxws.cxf5064.SOAPHeaderServiceImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerXMLBinding.java Wed Jul 3 17:28:15 2013
@@ -24,9 +24,9 @@ import java.util.List;
import javax.xml.ws.Endpoint;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.apache.headers.HeaderTesterImpl;
import org.apache.hello_world_xml_http.bare.GreeterImpl;
import org.apache.hello_world_xml_http.wrapped.GreeterFaultImpl;
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java Wed Jul 3 17:28:15 2013
@@ -26,11 +26,11 @@ import java.net.URLConnection;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.TestUtil;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java Wed Jul 3 17:28:15 2013
@@ -21,9 +21,9 @@ package org.apache.cxf.systest.soap12;
import javax.xml.ws.Endpoint;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.interceptors.URIMappingInterceptor;
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java?rev=1499490&r1=1499489&r2=1499490&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java Wed Jul 3 17:28:15 2013
@@ -25,18 +25,19 @@ import java.util.Set;
+
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.interceptor.AbstractEndpointSelectionInterceptor;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.StaxInInterceptor;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.interceptors.AbstractEndpointSelectionInterceptor;
public class MediatorInInterceptor extends AbstractEndpointSelectionInterceptor {