diff --git a/core/src/main/java/org/springframework/ws/WebServiceMessage.java b/core/src/main/java/org/springframework/ws/WebServiceMessage.java index 0acab316..3a10bd5f 100644 --- a/core/src/main/java/org/springframework/ws/WebServiceMessage.java +++ b/core/src/main/java/org/springframework/ws/WebServiceMessage.java @@ -48,12 +48,18 @@ public interface WebServiceMessage { /** * Writes the entire message to the given output stream. If the given stream is an instance of {@link - * org.springframework.ws.transport.TransportOutputStream TransportOutputStream}, the corresponding headers will be - * writen as well. + * org.springframework.ws.transport.TransportOutputStream}, the corresponding headers will be writen as well. * * @param outputStream the stream to write to * @throws IOException if an I/O exception occurs */ void writeTo(OutputStream outputStream) throws IOException; + /** + * Indicates whether this message contains a fault. + * + * @return true if the message has a fault; false otherwise + */ + boolean hasFault(); + } diff --git a/core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java b/core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java index 289c8c7f..0c57aa18 100644 --- a/core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java +++ b/core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java @@ -69,6 +69,10 @@ public class DomPoxMessage implements PoxMessage { return new DOMSource(document); } + public boolean hasFault() { + return false; + } + public void writeTo(OutputStream outputStream) throws IOException { try { if (outputStream instanceof TransportOutputStream) { diff --git a/core/src/main/java/org/springframework/ws/EndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/EndpointAdapter.java similarity index 98% rename from core/src/main/java/org/springframework/ws/EndpointAdapter.java rename to core/src/main/java/org/springframework/ws/server/EndpointAdapter.java index d6663d32..a2ececc2 100644 --- a/core/src/main/java/org/springframework/ws/EndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/EndpointAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws; +package org.springframework.ws.server; import org.springframework.ws.context.MessageContext; diff --git a/core/src/main/java/org/springframework/ws/EndpointExceptionResolver.java b/core/src/main/java/org/springframework/ws/server/EndpointExceptionResolver.java similarity index 97% rename from core/src/main/java/org/springframework/ws/EndpointExceptionResolver.java rename to core/src/main/java/org/springframework/ws/server/EndpointExceptionResolver.java index 69c3a080..0666b83b 100644 --- a/core/src/main/java/org/springframework/ws/EndpointExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/server/EndpointExceptionResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws; +package org.springframework.ws.server; import org.springframework.ws.context.MessageContext; diff --git a/core/src/main/java/org/springframework/ws/EndpointInterceptor.java b/core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java similarity index 91% rename from core/src/main/java/org/springframework/ws/EndpointInterceptor.java rename to core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java index c02aeb8f..50ea2a9d 100644 --- a/core/src/main/java/org/springframework/ws/EndpointInterceptor.java +++ b/core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws; +package org.springframework.ws.server; import org.springframework.ws.context.MessageContext; @@ -34,8 +34,8 @@ import org.springframework.ws.context.MessageContext; * * @author Arjen Poutsma * @see EndpointInvocationChain#getInterceptors() - * @see org.springframework.ws.endpoint.interceptor.EndpointInterceptorAdapter - * @see org.springframework.ws.endpoint.mapping.AbstractEndpointMapping#setInterceptors(EndpointInterceptor[]) + * @see org.springframework.ws.server.endpoint.interceptor.EndpointInterceptorAdapter + * @see org.springframework.ws.server.endpoint.mapping.AbstractEndpointMapping#setInterceptors(EndpointInterceptor[]) */ public interface EndpointInterceptor { diff --git a/core/src/main/java/org/springframework/ws/EndpointInvocationChain.java b/core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java similarity index 97% rename from core/src/main/java/org/springframework/ws/EndpointInvocationChain.java rename to core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java index 8e09d3e7..bdbbb567 100644 --- a/core/src/main/java/org/springframework/ws/EndpointInvocationChain.java +++ b/core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws; +package org.springframework.ws.server; /** * Endpoint invocation chain, consisting of an endpoint object and any preprocessing interceptors. diff --git a/core/src/main/java/org/springframework/ws/EndpointMapping.java b/core/src/main/java/org/springframework/ws/server/EndpointMapping.java similarity index 93% rename from core/src/main/java/org/springframework/ws/EndpointMapping.java rename to core/src/main/java/org/springframework/ws/server/EndpointMapping.java index c582fb17..bb69aec3 100644 --- a/core/src/main/java/org/springframework/ws/EndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/EndpointMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws; +package org.springframework.ws.server; import org.springframework.ws.context.MessageContext; @@ -31,8 +31,8 @@ import org.springframework.ws.context.MessageContext; * handlerRequest methods have returned true. * * @author Arjen Poutsma - * @see org.springframework.ws.endpoint.mapping.AbstractEndpointMapping - * @see org.springframework.ws.endpoint.mapping.PayloadRootQNameEndpointMapping + * @see org.springframework.ws.server.endpoint.mapping.AbstractEndpointMapping + * @see org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping * @see org.springframework.ws.soap.endpoint.mapping.SoapActionEndpointMapping */ public interface EndpointMapping { diff --git a/core/src/main/java/org/springframework/ws/MessageDispatcher.java b/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java similarity index 95% rename from core/src/main/java/org/springframework/ws/MessageDispatcher.java rename to core/src/main/java/org/springframework/ws/server/MessageDispatcher.java index 87cbb1d7..42bd4ee2 100644 --- a/core/src/main/java/org/springframework/ws/MessageDispatcher.java +++ b/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws; +package org.springframework.ws.server; import java.util.ArrayList; import java.util.Iterator; @@ -24,10 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; import org.springframework.util.ObjectUtils; +import org.springframework.ws.NoEndpointFoundException; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.MessageEndpoint; -import org.springframework.ws.endpoint.MessageEndpointAdapter; -import org.springframework.ws.endpoint.PayloadEndpointAdapter; +import org.springframework.ws.server.endpoint.MessageEndpoint; +import org.springframework.ws.server.endpoint.MessageEndpointAdapter; +import org.springframework.ws.server.endpoint.PayloadEndpointAdapter; /** * Central dispatcher for use withing Spring-WS. Dispatches Web service messages to registered endoints. @@ -158,7 +159,8 @@ public class MessageDispatcher implements MessageEndpoint, BeanNameAware { * Dispatches the request in the given MessageContext according to the configuration. * * @param messageContext the message context - * @throws NoEndpointFoundException thrown when an endpoint cannot be resolved for the incoming message + * @throws org.springframework.ws.NoEndpointFoundException + * thrown when an endpoint cannot be resolved for the incoming message */ protected final void dispatch(MessageContext messageContext) throws Exception { EndpointInvocationChain mappedEndpoint = null; @@ -266,8 +268,8 @@ public class MessageDispatcher implements MessageEndpoint, BeanNameAware { * PayloadEndpointAdapter. * * @see #setEndpointAdapters(java.util.List) - * @see org.springframework.ws.endpoint.MessageEndpointAdapter - * @see org.springframework.ws.endpoint.PayloadEndpointAdapter + * @see org.springframework.ws.server.endpoint.MessageEndpointAdapter + * @see org.springframework.ws.server.endpoint.PayloadEndpointAdapter */ protected void initDefaultStrategies() { List defaultEndpointAdapters = new ArrayList(); diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractDom4jPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java similarity index 98% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractDom4jPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java index 813ab6d2..9f8cdbc3 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractDom4jPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; import javax.xml.transform.Transformer; diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractDomPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java similarity index 99% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractDomPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java index 1cd8420b..b84c3183 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractDomPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractEndpointExceptionResolver.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java similarity index 96% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractEndpointExceptionResolver.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java index 79de9a1e..4c7c95ef 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractEndpointExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.ws.EndpointExceptionResolver; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointExceptionResolver; /** * Abstract base class for ExceptionResolvers. Provides a set of mapped endpoints that the resolver should diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractJDomPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java similarity index 97% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractJDomPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java index 036fec01..ed753826 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractJDomPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; import javax.xml.transform.Transformer; diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractLoggingInterceptor.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java similarity index 97% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractLoggingInterceptor.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java index 843e8efd..ba259ee3 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractLoggingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.io.StringWriter; import javax.xml.transform.OutputKeys; @@ -24,9 +24,9 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamResult; -import org.springframework.ws.EndpointInterceptor; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointInterceptor; import org.springframework.xml.transform.TransformerObjectSupport; /** diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractMarshallingPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java similarity index 98% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractMarshallingPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java index 8e6a2962..ab08f859 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractMarshallingPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractSaxPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java similarity index 98% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractSaxPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java index aa79218c..d775ad6d 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractSaxPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; import javax.xml.transform.Transformer; diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractStaxEventPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java similarity index 98% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractStaxEventPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java index 58a0f4d1..45e09a67 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractStaxEventPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; - import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventReader; @@ -43,8 +42,8 @@ import org.springframework.xml.transform.StaxSource; * the request with a XMLEventReader, and to create a response using a XMLEventWriter. * * @author Arjen Poutsma - * @see #invokeInternal(javax.xml.stream.XMLEventReader, javax.xml.stream.util.XMLEventConsumer, - * javax.xml.stream.XMLEventFactory) + * @see #invokeInternal(javax.xml.stream.XMLEventReader,javax.xml.stream.util.XMLEventConsumer, + *javax.xml.stream.XMLEventFactory) * @see XMLEventReader * @see XMLEventWriter */ diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractStaxPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java similarity index 98% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractStaxPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java index e69e70f6..69f9a25f 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractStaxPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractStaxStreamPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java similarity index 98% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractStaxStreamPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java index 2448f217..d29dee4b 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractStaxStreamPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -40,7 +40,7 @@ import org.springframework.xml.transform.StaxSource; * request with a XMLStreamReader, and to create a response using a XMLStreamWriter. * * @author Arjen Poutsma - * @see #invokeInternal(javax.xml.stream.XMLStreamReader, javax.xml.stream.XMLStreamWriter) + * @see #invokeInternal(javax.xml.stream.XMLStreamReader,javax.xml.stream.XMLStreamWriter) * @see XMLStreamReader * @see XMLStreamWriter */ diff --git a/core/src/main/java/org/springframework/ws/endpoint/AbstractXomPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java similarity index 99% rename from core/src/main/java/org/springframework/ws/endpoint/AbstractXomPayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java index 6366fb4d..43683d19 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/AbstractXomPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.io.IOException; - import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; @@ -28,11 +27,10 @@ import nu.xom.Document; import nu.xom.Element; import nu.xom.ParsingException; import nu.xom.converters.DOMConverter; +import org.springframework.xml.transform.StringSource; import org.w3c.dom.Node; import org.xml.sax.InputSource; -import org.springframework.xml.transform.StringSource; - /** * Abstract base class for endpoints that handle the message payload as XOM elements. Offers the message payload as a * XOM Element, and allows subclasses to create a response by returning an Element. diff --git a/core/src/main/java/org/springframework/ws/endpoint/MessageEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java similarity index 96% rename from core/src/main/java/org/springframework/ws/endpoint/MessageEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java index d606d5f9..508e33b1 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/MessageEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import org.springframework.ws.context.MessageContext; diff --git a/core/src/main/java/org/springframework/ws/endpoint/MessageEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpointAdapter.java similarity index 87% rename from core/src/main/java/org/springframework/ws/endpoint/MessageEndpointAdapter.java rename to core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpointAdapter.java index 22cd94ca..824e679e 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/MessageEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpointAdapter.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; -import org.springframework.ws.EndpointAdapter; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointAdapter; /** * Adapter to use a MessageEndpoint as the endpoint for a EndpointInvocationChain. * * @author Arjen Poutsma - * @see org.springframework.ws.EndpointInvocationChain + * @see org.springframework.ws.server.EndpointInvocationChain */ public class MessageEndpointAdapter implements EndpointAdapter { diff --git a/core/src/main/java/org/springframework/ws/endpoint/PayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java similarity index 96% rename from core/src/main/java/org/springframework/ws/endpoint/PayloadEndpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java index 5d7a8916..cae80d5e 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/PayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; diff --git a/core/src/main/java/org/springframework/ws/endpoint/PayloadEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapter.java similarity index 91% rename from core/src/main/java/org/springframework/ws/endpoint/PayloadEndpointAdapter.java rename to core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapter.java index 64ded889..b14b3d26 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/PayloadEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; import javax.xml.transform.Transformer; -import org.springframework.ws.EndpointAdapter; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointAdapter; import org.springframework.xml.transform.TransformerObjectSupport; /** @@ -29,7 +29,7 @@ import org.springframework.xml.transform.TransformerObjectSupport; * * @author Arjen Poutsma * @see PayloadEndpoint - * @see org.springframework.ws.EndpointInvocationChain + * @see org.springframework.ws.server.EndpointInvocationChain */ public class PayloadEndpointAdapter extends TransformerObjectSupport implements EndpointAdapter { diff --git a/core/src/main/java/org/springframework/ws/endpoint/interceptor/AbstractValidatingInterceptor.java b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java similarity index 99% rename from core/src/main/java/org/springframework/ws/endpoint/interceptor/AbstractValidatingInterceptor.java rename to core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java index 04adf27f..ecae1988 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/interceptor/AbstractValidatingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import java.io.IOException; import java.util.Locale; @@ -29,9 +29,9 @@ import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import org.springframework.ws.EndpointInterceptor; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointInterceptor; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapFault; import org.springframework.ws.soap.SoapFaultDetail; diff --git a/core/src/main/java/org/springframework/ws/endpoint/interceptor/EndpointInterceptorAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java similarity index 94% rename from core/src/main/java/org/springframework/ws/endpoint/interceptor/EndpointInterceptorAdapter.java rename to core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java index c9e14a23..a9c1ebb8 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/interceptor/EndpointInterceptorAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.ws.EndpointInterceptor; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointInterceptor; import org.w3c.dom.Element; /** diff --git a/core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadLoggingInterceptor.java b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java similarity index 90% rename from core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadLoggingInterceptor.java rename to core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java index 9167112d..0d2a00f8 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadLoggingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import javax.xml.transform.Source; import org.springframework.ws.WebServiceMessage; -import org.springframework.ws.endpoint.AbstractLoggingInterceptor; +import org.springframework.ws.server.endpoint.AbstractLoggingInterceptor; /** * Simple EndpointInterceptor that logs the payload of request and response messages. By default, both diff --git a/core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadTransformingInterceptor.java b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java similarity index 97% rename from core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadTransformingInterceptor.java rename to core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java index 64450831..5c665b41 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadTransformingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; @@ -26,9 +26,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.Resource; import org.springframework.util.Assert; -import org.springframework.ws.EndpointInterceptor; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointInterceptor; import org.springframework.xml.sax.SaxUtils; /** diff --git a/core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadValidatingInterceptor.java b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadValidatingInterceptor.java similarity index 97% rename from core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadValidatingInterceptor.java rename to core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadValidatingInterceptor.java index e33819a9..9274fcfc 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/interceptor/PayloadValidatingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadValidatingInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import javax.xml.transform.Source; diff --git a/core/src/main/java/org/springframework/ws/endpoint/interceptor/package.html b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html similarity index 100% rename from core/src/main/java/org/springframework/ws/endpoint/interceptor/package.html rename to core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html diff --git a/core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java similarity index 93% rename from core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractEndpointMapping.java rename to core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java index 9097414f..05298a18 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.mapping; +package org.springframework.ws.server.endpoint.mapping; import org.springframework.context.support.ApplicationObjectSupport; -import org.springframework.ws.EndpointInterceptor; -import org.springframework.ws.EndpointInvocationChain; -import org.springframework.ws.EndpointMapping; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointInterceptor; +import org.springframework.ws.server.EndpointInvocationChain; +import org.springframework.ws.server.EndpointMapping; /** * Abstract base class for EndpointMapping implementations. Supports a default endpoint, and endpoint interceptors. * * @author Arjen Poutsma * @see #getEndpointInternal(org.springframework.ws.context.MessageContext) - * @see org.springframework.ws.EndpointInterceptor + * @see org.springframework.ws.server.EndpointInterceptor */ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport implements EndpointMapping { @@ -108,7 +108,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i * @param endpoint the endpoint * @param interceptors the endpoint interceptors * @return the created invocation chain - * @see #setInterceptors(org.springframework.ws.EndpointInterceptor[]) + * @see #setInterceptors(org.springframework.ws.server.EndpointInterceptor[]) */ protected EndpointInvocationChain createEndpointInvocationChain(MessageContext messageContext, Object endpoint, diff --git a/core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractMapBasedEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java similarity index 99% rename from core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractMapBasedEndpointMapping.java rename to core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java index f4db00b9..9f950848 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractMapBasedEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.mapping; +package org.springframework.ws.server.endpoint.mapping; import java.util.HashMap; import java.util.Iterator; diff --git a/core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractQNameEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java similarity index 96% rename from core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractQNameEndpointMapping.java rename to core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java index 91c0f6a6..28a4a355 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/mapping/AbstractQNameEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.mapping; +package org.springframework.ws.server.endpoint.mapping; import javax.xml.namespace.QName; diff --git a/core/src/main/java/org/springframework/ws/endpoint/mapping/PayloadRootQNameEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java similarity index 98% rename from core/src/main/java/org/springframework/ws/endpoint/mapping/PayloadRootQNameEndpointMapping.java rename to core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java index 16b1b0c3..69f52981 100644 --- a/core/src/main/java/org/springframework/ws/endpoint/mapping/PayloadRootQNameEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.mapping; +package org.springframework.ws.server.endpoint.mapping; import javax.xml.namespace.QName; import javax.xml.transform.Transformer; diff --git a/core/src/main/java/org/springframework/ws/endpoint/mapping/package.html b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html similarity index 100% rename from core/src/main/java/org/springframework/ws/endpoint/mapping/package.html rename to core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html diff --git a/core/src/main/java/org/springframework/ws/endpoint/package.html b/core/src/main/java/org/springframework/ws/server/endpoint/package.html similarity index 100% rename from core/src/main/java/org/springframework/ws/endpoint/package.html rename to core/src/main/java/org/springframework/ws/server/endpoint/package.html diff --git a/core/src/main/java/org/springframework/ws/server/package.html b/core/src/main/java/org/springframework/ws/server/package.html new file mode 100644 index 00000000..a742ac51 --- /dev/null +++ b/core/src/main/java/org/springframework/ws/server/package.html @@ -0,0 +1,5 @@ + + +Contains classes for server-side Spring-WS support. + + diff --git a/core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java b/core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java index 894e2d72..e1305057 100644 --- a/core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java +++ b/core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java @@ -56,6 +56,13 @@ public abstract class AbstractSoapMessage implements SoapMessage { return getSoapBody().getPayloadResult(); } + /** + * Returns getSoapBody().hasFault(). + */ + public boolean hasFault() { + return getSoapBody().hasFault(); + } + public SoapVersion getVersion() { if (version == null) { String envelopeNamespace = getEnvelope().getName().getNamespaceURI(); diff --git a/core/src/main/java/org/springframework/ws/soap/SoapEndpointInterceptor.java b/core/src/main/java/org/springframework/ws/soap/SoapEndpointInterceptor.java index 4f758697..ebc0b892 100644 --- a/core/src/main/java/org/springframework/ws/soap/SoapEndpointInterceptor.java +++ b/core/src/main/java/org/springframework/ws/soap/SoapEndpointInterceptor.java @@ -16,8 +16,8 @@ package org.springframework.ws.soap; -import org.springframework.ws.EndpointInterceptor; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointInterceptor; /** * SOAP-specific extension of the EndpointInterceptor interface. Allows for handling of SOAP faults, which diff --git a/core/src/main/java/org/springframework/ws/soap/SoapEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/SoapEndpointMapping.java index 16cf0725..a6b6f6fc 100644 --- a/core/src/main/java/org/springframework/ws/soap/SoapEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/SoapEndpointMapping.java @@ -16,7 +16,7 @@ package org.springframework.ws.soap; -import org.springframework.ws.EndpointMapping; +import org.springframework.ws.server.EndpointMapping; /** * SOAP-specific sub-interface of the EndpointMapping. Adds associated actors (SOAP 1.1) or roles (SOAP diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolver.java index 453f5aec..f3ea28b5 100644 --- a/core/src/main/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolver.java @@ -5,7 +5,7 @@ import java.util.Locale; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.AbstractEndpointExceptionResolver; +import org.springframework.ws.server.endpoint.AbstractEndpointExceptionResolver; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapMessage; diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolver.java index 5234e1fe..c4c8eb4e 100644 --- a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolver.java @@ -21,7 +21,7 @@ import java.util.Properties; import org.springframework.util.Assert; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.AbstractEndpointExceptionResolver; +import org.springframework.ws.server.endpoint.AbstractEndpointExceptionResolver; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.soap11.Soap11Body; diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java b/core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java index 0e909887..606a0fe6 100644 --- a/core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java @@ -20,7 +20,7 @@ import javax.xml.transform.Source; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.AbstractLoggingInterceptor; +import org.springframework.ws.server.endpoint.AbstractLoggingInterceptor; import org.springframework.ws.soap.SoapEndpointInterceptor; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMapping.java index 7975e11f..ed6e02f0 100644 --- a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMapping.java @@ -18,11 +18,11 @@ package org.springframework.ws.soap.endpoint.mapping; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import org.springframework.ws.EndpointInvocationChain; -import org.springframework.ws.EndpointMapping; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.soap.SoapEndpointInvocationChain; +import org.springframework.ws.server.EndpointInvocationChain; +import org.springframework.ws.server.EndpointMapping; import org.springframework.ws.soap.SoapEndpointMapping; +import org.springframework.ws.soap.server.SoapEndpointInvocationChain; /** * EndpointMapping implement that adds SOAP actors or roles to a delegate endpoint. Delegates to another @@ -71,8 +71,7 @@ public class DelegatingSoapEndpointMapping implements InitializingBean, SoapEndp */ public EndpointInvocationChain getEndpoint(MessageContext messageContext) throws Exception { EndpointInvocationChain delegateChain = delegate.getEndpoint(messageContext); - return new SoapEndpointInvocationChain(delegateChain.getEndpoint(), - delegateChain.getInterceptors(), + return new SoapEndpointInvocationChain(delegateChain.getEndpoint(), delegateChain.getInterceptors(), actorsOrRoles); } diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMapping.java index 24e301ed..60d77963 100644 --- a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMapping.java @@ -18,13 +18,13 @@ package org.springframework.ws.soap.endpoint.mapping; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.ws.EndpointInterceptor; -import org.springframework.ws.EndpointInvocationChain; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.mapping.AbstractMapBasedEndpointMapping; -import org.springframework.ws.soap.SoapEndpointInvocationChain; +import org.springframework.ws.server.EndpointInterceptor; +import org.springframework.ws.server.EndpointInvocationChain; +import org.springframework.ws.server.endpoint.mapping.AbstractMapBasedEndpointMapping; import org.springframework.ws.soap.SoapEndpointMapping; import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.soap.server.SoapEndpointInvocationChain; /** * Implementation of the EndpointMapping interface to map from SOAPAction headers to endpoint @@ -69,7 +69,7 @@ public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping i * @param endpoint the endpoint * @param interceptors the endpoint interceptors * @return the created invocation chain - * @see #setInterceptors(org.springframework.ws.EndpointInterceptor[]) + * @see #setInterceptors(org.springframework.ws.server.EndpointInterceptor[]) * @see #setActorsOrRoles(String[]) */ protected final EndpointInvocationChain createEndpointInvocationChain(MessageContext messageContext, diff --git a/core/src/main/java/org/springframework/ws/soap/SoapEndpointInvocationChain.java b/core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java similarity index 93% rename from core/src/main/java/org/springframework/ws/soap/SoapEndpointInvocationChain.java rename to core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java index 0acee05a..338a4a01 100644 --- a/core/src/main/java/org/springframework/ws/soap/SoapEndpointInvocationChain.java +++ b/core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.ws.soap; +package org.springframework.ws.soap.server; -import org.springframework.ws.EndpointInterceptor; -import org.springframework.ws.EndpointInvocationChain; +import org.springframework.ws.server.EndpointInterceptor; +import org.springframework.ws.server.EndpointInvocationChain; /** * SOAP-specific subclass of the EndpointInvocationChain. Adds associated actors (SOAP 1.1) or roles (SOAP diff --git a/core/src/main/java/org/springframework/ws/soap/SoapMessageDispatcher.java b/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java similarity index 89% rename from core/src/main/java/org/springframework/ws/soap/SoapMessageDispatcher.java rename to core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java index 3f6cf6e7..234e47c8 100644 --- a/core/src/main/java/org/springframework/ws/soap/SoapMessageDispatcher.java +++ b/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.soap; +package org.springframework.ws.soap.server; import java.util.ArrayList; import java.util.Collections; @@ -25,10 +25,17 @@ import javax.xml.namespace.QName; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import org.springframework.ws.EndpointInterceptor; -import org.springframework.ws.EndpointInvocationChain; -import org.springframework.ws.MessageDispatcher; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.EndpointInterceptor; +import org.springframework.ws.server.EndpointInvocationChain; +import org.springframework.ws.server.MessageDispatcher; +import org.springframework.ws.soap.SoapBody; +import org.springframework.ws.soap.SoapEndpointInterceptor; +import org.springframework.ws.soap.SoapFault; +import org.springframework.ws.soap.SoapHeader; +import org.springframework.ws.soap.SoapHeaderElement; +import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.soap.SoapVersion; import org.springframework.ws.soap.endpoint.SimpleSoapExceptionResolver; import org.springframework.ws.soap.soap12.Soap12Header; @@ -37,8 +44,8 @@ import org.springframework.ws.soap.soap12.Soap12Header; * invocation chain, and endpoint interception using SoapEndpointInterceptors. * * @author Arjen Poutsma - * @see SoapMessage - * @see SoapEndpointInterceptor + * @see org.springframework.ws.soap.SoapMessage + * @see org.springframework.ws.soap.SoapEndpointInterceptor */ public class SoapMessageDispatcher extends MessageDispatcher { @@ -73,7 +80,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { * Initialize the default implementations for the dispatcher's strategies, in addition to the strategies defined in * the base class: a SimpleSoapExceptionResolver as exception resolver. * - * @see org.springframework.ws.MessageDispatcher#initDefaultStrategies() + * @see org.springframework.ws.server.MessageDispatcher#initDefaultStrategies() * @see #setEndpointExceptionResolvers(java.util.List) * @see org.springframework.ws.soap.endpoint.SimpleSoapExceptionResolver */ @@ -91,7 +98,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { * @param messageContext the message context * @return true if all necessary headers are understood; false otherwise * @see SoapEndpointInvocationChain#getActorsOrRoles() - * @see SoapHeader#examineMustUnderstandHeaderElements(String) + * @see org.springframework.ws.soap.SoapHeader#examineMustUnderstandHeaderElements(String) */ protected boolean handleRequest(EndpointInvocationChain mappedEndpoint, MessageContext messageContext) { if (messageContext.getRequest() instanceof SoapMessage) { @@ -118,7 +125,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { * Determines the roles for a specific SOAP invocation chain. Gets the roles specified on the chain, and adds the * SOAP-version specific 'next' role to it. * - * @see SoapVersion#getNextActorOrRoleUri() + * @see org.springframework.ws.soap.SoapVersion#getNextActorOrRoleUri() */ protected String[] getRoles(EndpointInvocationChain mappedEndpoint, SoapVersion version) { String[] mappedRoles = null; @@ -138,7 +145,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { * SoapEndpointInterceptor. If they are, returns true. If they are not, a SOAP fault is * created, and false is returned. * - * @see SoapEndpointInterceptor#understands(SoapHeaderElement) + * @see org.springframework.ws.soap.SoapEndpointInterceptor#understands(org.springframework.ws.soap.SoapHeaderElement) */ private boolean handleRequestForRole(EndpointInvocationChain mappedEndpoint, MessageContext messageContext, @@ -197,7 +204,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { * @param mappedEndpoint the mapped EndpointInvocationChain * @param interceptorIndex index of last interceptor that was called * @param messageContext the message context, whose request and response are filled - * @see org.springframework.ws.EndpointInterceptor#handleResponse(org.springframework.ws.context.MessageContext, + * @see org.springframework.ws.server.EndpointInterceptor#handleResponse(org.springframework.ws.context.MessageContext, *Object) */ protected void triggerHandleResponse(EndpointInvocationChain mappedEndpoint, diff --git a/core/src/main/java/org/springframework/ws/soap/server/package.html b/core/src/main/java/org/springframework/ws/soap/server/package.html new file mode 100644 index 00000000..b510015d --- /dev/null +++ b/core/src/main/java/org/springframework/ws/soap/server/package.html @@ -0,0 +1,5 @@ + + +Contains classes for SOAP-specific server-side Spring-WS support. + + diff --git a/core/src/main/java/org/springframework/ws/transport/MessageReceiverObjectSupport.java b/core/src/main/java/org/springframework/ws/transport/MessageReceiverObjectSupport.java index ee7381d4..c81f72da 100644 --- a/core/src/main/java/org/springframework/ws/transport/MessageReceiverObjectSupport.java +++ b/core/src/main/java/org/springframework/ws/transport/MessageReceiverObjectSupport.java @@ -25,14 +25,14 @@ import org.springframework.ws.WebServiceMessage; import org.springframework.ws.WebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.MessageEndpoint; +import org.springframework.ws.server.endpoint.MessageEndpoint; /** * Convenience base class for server-side transport objects. Contains a {@link WebServiceMessageFactory}, and has * methods for handling incoming WebServiceMessage requests. * * @author Arjen Poutsma - * @see #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint) + * @see #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.server.endpoint.MessageEndpoint) */ public abstract class MessageReceiverObjectSupport implements InitializingBean { @@ -87,7 +87,7 @@ public abstract class MessageReceiverObjectSupport implements InitializingBean { } /** - * Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint)} + * Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.server.endpoint.MessageEndpoint)} * when no response is given. Default implementation does nothing. Can be overriden to set certain * transport-specific response headers. * @@ -98,7 +98,7 @@ public abstract class MessageReceiverObjectSupport implements InitializingBean { } /** - * Handles the sending of the response. Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint)}. + * Handles the sending of the response. Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.server.endpoint.MessageEndpoint)}. * Default implementation writes the given response to the given TransportOutputStream. Can be * overriden to set certain transport-specific headers. * @@ -113,7 +113,7 @@ public abstract class MessageReceiverObjectSupport implements InitializingBean { } /** - * Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint)} + * Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.server.endpoint.MessageEndpoint)} * when no suitable endpoint is found. Default implementation does nothing. Can be overriden to set certain * transport-specific response headers. * diff --git a/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java b/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java index 4c432552..4a317069 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java +++ b/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java @@ -23,11 +23,11 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.util.StringUtils; import org.springframework.web.servlet.FrameworkServlet; import org.springframework.web.util.WebUtils; -import org.springframework.ws.EndpointAdapter; -import org.springframework.ws.EndpointExceptionResolver; -import org.springframework.ws.EndpointMapping; -import org.springframework.ws.MessageDispatcher; import org.springframework.ws.WebServiceMessageFactory; +import org.springframework.ws.server.EndpointAdapter; +import org.springframework.ws.server.EndpointExceptionResolver; +import org.springframework.ws.server.EndpointMapping; +import org.springframework.ws.server.MessageDispatcher; import org.springframework.ws.wsdl.WsdlDefinition; /** @@ -46,7 +46,7 @@ import org.springframework.ws.wsdl.WsdlDefinition; * * @author Arjen Poutsma * @see org.springframework.web.servlet.DispatcherServlet - * @see org.springframework.ws.MessageDispatcher + * @see org.springframework.ws.server.MessageDispatcher * @see org.springframework.ws.transport.http.MessageEndpointHandlerAdapter */ public class MessageDispatcherServlet extends FrameworkServlet { @@ -56,7 +56,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * when detectAllEndpointAdapters is turned off. * * @see #setDetectAllEndpointAdapters(boolean) - * @see org.springframework.ws.EndpointAdapter + * @see org.springframework.ws.server.EndpointAdapter */ public static final String ENDPOINT_ADAPTER_BEAN_NAME = "endpointAdapter"; @@ -76,10 +76,14 @@ public class MessageDispatcherServlet extends FrameworkServlet { */ public static final String ENDPOINT_MAPPING_BEAN_NAME = "endpointMapping"; - /** Well-known name for the WebServiceMessageFactory object in the bean factory for this namespace. */ + /** + * Well-known name for the WebServiceMessageFactory object in the bean factory for this namespace. + */ public static final String WEB_SERVICE_MESSAGE_FACTORY_BEAN_NAME = "messageFactory"; - /** Well-known name for the MessageDispatcher object in the bean factory for this namespace. */ + /** + * Well-known name for the MessageDispatcher object in the bean factory for this namespace. + */ public static final String MESSAGE_DISPATCHER_BEAN_NAME = "messageDispatcher"; /** @@ -88,33 +92,51 @@ public class MessageDispatcherServlet extends FrameworkServlet { */ private static final String DEFAULT_STRATEGIES_PATH = "MessageDispatcherServlet.properties"; - /** Suffix of a WSDL request uri. */ + /** + * Suffix of a WSDL request uri. + */ private static final String WSDL_SUFFIX_NAME = ".wsdl"; private static final Properties defaultStrategies = new Properties(); - /** Detect all EndpointAdapters or just expect "endpointAdapter" bean? */ + /** + * Detect all EndpointAdapters or just expect "endpointAdapter" bean? + */ private boolean detectAllEndpointAdapters = true; - /** Detect all EndpointExceptionResolvers or just expect "endpointExceptionResolver" bean? */ + /** + * Detect all EndpointExceptionResolvers or just expect "endpointExceptionResolver" bean? + */ private boolean detectAllEndpointExceptionResolvers = true; - /** Detect all EndpointMappings or just expect "endpointMapping" bean? */ + /** + * Detect all EndpointMappings or just expect "endpointMapping" bean? + */ private boolean detectAllEndpointMappings = true; - /** Detect all WsdlDefinitions? */ + /** + * Detect all WsdlDefinitions? + */ private boolean detectAllWsdlDefinitions = true; - /** The MessageEndpointHandlerAdapter used by this servlet. */ + /** + * The MessageEndpointHandlerAdapter used by this servlet. + */ private MessageEndpointHandlerAdapter messageEndpointHandlerAdapter = new MessageEndpointHandlerAdapter(); - /** The WsdlDefinitionHandlerAdapter used by this servlet. */ + /** + * The WsdlDefinitionHandlerAdapter used by this servlet. + */ private WsdlDefinitionHandlerAdapter wsdlDefinitionHandlerAdapter = new WsdlDefinitionHandlerAdapter(); - /** The MessageDispatcher used by this servlet. */ + /** + * The MessageDispatcher used by this servlet. + */ private MessageDispatcher messageDispatcher; - /** Keys are beans names, values are WsdlDefinitions. */ + /** + * Keys are beans names, values are WsdlDefinitions. + */ private Map wsdlDefinitions; static { @@ -139,7 +161,9 @@ public class MessageDispatcherServlet extends FrameworkServlet { public MessageDispatcherServlet() { } - /** Returns the MessageDispatcher used by this servlet. */ + /** + * Returns the MessageDispatcher used by this servlet. + */ protected MessageDispatcher getMessageDispatcher() { return messageDispatcher; } @@ -151,7 +175,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * Default is true. Turn this off if you want this servlet to use a single adapter, despite multiple * adapter beans being defined in the context. * - * @see org.springframework.ws.EndpointAdapter + * @see org.springframework.ws.server.EndpointAdapter */ public void setDetectAllEndpointAdapters(boolean detectAllEndpointAdapters) { this.detectAllEndpointAdapters = detectAllEndpointAdapters; @@ -164,7 +188,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * Default is true. Turn this off if you want this servlet to use a single exception resolver, despite * multiple resolver beans being defined in the context. * - * @see org.springframework.ws.EndpointExceptionResolver + * @see org.springframework.ws.server.EndpointExceptionResolver */ public void setDetectAllEndpointExceptionResolvers(boolean detectAllEndpointExceptionResolvers) { this.detectAllEndpointExceptionResolvers = detectAllEndpointExceptionResolvers; @@ -177,7 +201,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * Default is true. Turn this off if you want this servlet to use a single mapping, despite multiple * mapping beans being defined in the context. * - * @see org.springframework.ws.EndpointMapping + * @see org.springframework.ws.server.EndpointMapping */ public void setDetectAllEndpointMappings(boolean detectAllEndpointMappings) { this.detectAllEndpointMappings = detectAllEndpointMappings; @@ -298,7 +322,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * Initialize the EndpointAdapters used by this class. If no adapter beans are defined in the bean * factory for this namespace, we default to the strategies in MessageDispatcher. * - * @see org.springframework.ws.MessageDispatcher#initDefaultStrategies() + * @see org.springframework.ws.server.MessageDispatcher#initDefaultStrategies() */ private void initEndpointAdapters() throws BeansException { if (detectAllEndpointAdapters) { @@ -356,7 +380,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * Initialize the EndpointMappings used by this class. If no mapping beans are defined in the * BeanFactory for this namespace, we default to the strategies in MessageDispatcher. * - * @see org.springframework.ws.MessageDispatcher#initDefaultStrategies() + * @see org.springframework.ws.server.MessageDispatcher#initDefaultStrategies() */ private void initEndpointMappings() throws BeansException { if (detectAllEndpointMappings) { diff --git a/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java b/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java index 57c8fb26..55215bd4 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java +++ b/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java @@ -23,8 +23,7 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.ModelAndView; import org.springframework.ws.WebServiceMessage; -import org.springframework.ws.endpoint.MessageEndpoint; -import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.server.endpoint.MessageEndpoint; import org.springframework.ws.transport.MessageReceiverObjectSupport; import org.springframework.ws.transport.TransportInputStream; import org.springframework.ws.transport.TransportOutputStream; @@ -41,8 +40,8 @@ import org.springframework.ws.transport.TransportOutputStream; * @author Arjen Poutsma * @see #setMessageFactory(org.springframework.ws.WebServiceMessageFactory) * @see org.springframework.ws.WebServiceMessageFactory - * @see org.springframework.ws.endpoint.MessageEndpoint - * @see org.springframework.ws.MessageDispatcher + * @see org.springframework.ws.server.endpoint.MessageEndpoint + * @see org.springframework.ws.server.MessageDispatcher */ public class MessageEndpointHandlerAdapter extends MessageReceiverObjectSupport implements HandlerAdapter { @@ -83,7 +82,7 @@ public class MessageEndpointHandlerAdapter extends MessageReceiverObjectSupport protected void handleResponse(TransportInputStream tis, TransportOutputStream tos, WebServiceMessage response) throws Exception { HttpServletResponse httpServletResponse = ((HttpServletTransportOutputStream) tos).getHttpServletResponse(); - if (response instanceof SoapMessage && ((SoapMessage) response).getSoapBody().hasFault()) { + if (response.hasFault()) { httpServletResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } else { diff --git a/core/src/main/resources/org/springframework/ws/MessageDispatcher.properties b/core/src/main/resources/org/springframework/ws/MessageDispatcher.properties index 7e807c98..f5b271bd 100644 --- a/core/src/main/resources/org/springframework/ws/MessageDispatcher.properties +++ b/core/src/main/resources/org/springframework/ws/MessageDispatcher.properties @@ -1,5 +1,5 @@ # Default implementation classes for MessageDispatcher's strategy interfaces. # Used as fallback when no matching beans are found in the MessageDispatcher context. # Not meant to be customized by application developers -org.springframework.ws.EndpointAdapter=org.springframework.ws.endpoint.MessageEndpointAdapter,\ - org.springframework.ws.endpoint.PayloadEndpointAdapter \ No newline at end of file +org.springframework.ws.server.EndpointAdapter=org.springframework.ws.server.endpoint.MessageEndpointAdapter,\ + org.springframework.ws.server.endpoint.PayloadEndpointAdapter \ No newline at end of file diff --git a/core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties b/core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties index a27f274a..a1bdcee0 100644 --- a/core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties +++ b/core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties @@ -2,6 +2,6 @@ # Used as fallback when no matching beans are found in the DispatcherServlet context. # Not meant to be customized by application developers. -org.springframework.ws.MessageDispatcher=org.springframework.ws.soap.SoapMessageDispatcher +org.springframework.ws.server.MessageDispatcher=org.springframework.ws.soap.server.SoapMessageDispatcher org.springframework.ws.WebServiceMessageFactory=org.springframework.ws.soap.saaj.SaajSoapMessageFactory \ No newline at end of file diff --git a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java index 9645a1f3..2a249bee 100644 --- a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java +++ b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java @@ -75,6 +75,10 @@ public abstract class AbstractWebServiceMessageTestCase extends XMLTestCase { XMLUnit.setIgnoreWhitespace(true); } + public void testHasFault() throws Exception { + assertFalse("Mesage has fault", webServiceMessage.hasFault()); + } + public void testDomPayload() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); documentBuilderFactory.setNamespaceAware(true); diff --git a/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java b/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java index 8a54775c..6e1a80c9 100644 --- a/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java +++ b/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java @@ -46,6 +46,8 @@ public class MockWebServiceMessage implements WebServiceMessage { private final StringBuffer content; + private boolean fault = false; + public MockWebServiceMessage() { content = new StringBuffer(); } @@ -100,6 +102,14 @@ public class MockWebServiceMessage implements WebServiceMessage { return new StringSource(content.toString()); } + public boolean hasFault() { + return fault; + } + + public void setFault(boolean fault) { + this.fault = fault; + } + public void writeTo(OutputStream outputStream) throws IOException { PrintWriter writer = new PrintWriter(outputStream); writer.write(content.toString()); diff --git a/core/src/test/java/org/springframework/ws/MessageDispatcherTest.java b/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java similarity index 98% rename from core/src/test/java/org/springframework/ws/MessageDispatcherTest.java rename to core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java index 18f377b3..a483ee94 100644 --- a/core/src/test/java/org/springframework/ws/MessageDispatcherTest.java +++ b/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.ws; +package org.springframework.ws.server; import java.util.Collections; import junit.framework.TestCase; import org.easymock.MockControl; +import org.springframework.ws.MockWebServiceMessage; +import org.springframework.ws.WebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; diff --git a/core/src/test/java/org/springframework/ws/endpoint/AbstractEndpointTestCase.java b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java similarity index 89% rename from core/src/test/java/org/springframework/ws/endpoint/AbstractEndpointTestCase.java rename to core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java index df7afb21..e5a6cb0b 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/AbstractEndpointTestCase.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.Reader; import java.io.StringReader; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.stream.XMLEventReader; @@ -32,24 +31,23 @@ import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; import org.custommonkey.xmlunit.XMLTestCase; +import org.springframework.xml.transform.StaxSource; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; -import org.springframework.xml.transform.StaxSource; - public abstract class AbstractEndpointTestCase extends XMLTestCase { - protected final static String NAMESPACE_URI = "http://springframework.org/ws"; + protected static final String NAMESPACE_URI = "http://springframework.org/ws"; - protected final static String REQUEST_ELEMENT = "request"; + protected static final String REQUEST_ELEMENT = "request"; - protected final static String RESPONSE_ELEMENT = "response"; + protected static final String RESPONSE_ELEMENT = "response"; - protected final static String REQUEST = "<" + REQUEST_ELEMENT + " xmlns=\"" + NAMESPACE_URI + "\"/>"; + protected static final String REQUEST = "<" + REQUEST_ELEMENT + " xmlns=\"" + NAMESPACE_URI + "\"/>"; - protected final static String RESPONSE = "<" + RESPONSE_ELEMENT + " xmlns=\"" + NAMESPACE_URI + "\"/>"; + protected static final String RESPONSE = "<" + RESPONSE_ELEMENT + " xmlns=\"" + NAMESPACE_URI + "\"/>"; public void testDomSource() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/endpoint/AbstractMessageEndpointTestCase.java b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/AbstractMessageEndpointTestCase.java rename to core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java index 8405b198..8d24b00b 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/AbstractMessageEndpointTestCase.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; diff --git a/core/src/test/java/org/springframework/ws/endpoint/AbstractPayloadEndpointTestCase.java b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/AbstractPayloadEndpointTestCase.java rename to core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java index a7aed7b9..f59a0126 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/AbstractPayloadEndpointTestCase.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; import javax.xml.transform.Transformer; diff --git a/core/src/test/java/org/springframework/ws/endpoint/Dom4jPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/Dom4jPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java index 64e347b3..82cd71db 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/Dom4jPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import org.dom4j.Document; import org.dom4j.Element; diff --git a/core/src/test/java/org/springframework/ws/endpoint/DomPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/DomPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java index f9303fa1..cbf9257f 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/DomPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/core/src/test/java/org/springframework/ws/endpoint/JDomPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/JDomPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java index 5ff35a00..535e295c 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/JDomPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import org.jdom.Element; import org.jdom.Namespace; diff --git a/core/src/test/java/org/springframework/ws/endpoint/MarshallingPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java similarity index 99% rename from core/src/test/java/org/springframework/ws/endpoint/MarshallingPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java index e4c7e3fb..7e52100c 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/MarshallingPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.io.StringReader; import java.io.StringWriter; diff --git a/core/src/test/java/org/springframework/ws/endpoint/MessageEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/MessageEndpointAdapterTest.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/MessageEndpointAdapterTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/MessageEndpointAdapterTest.java index d9ad292e..32fc248c 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/MessageEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/MessageEndpointAdapterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import junit.framework.TestCase; import org.easymock.MockControl; diff --git a/core/src/test/java/org/springframework/ws/endpoint/PayloadEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapterTest.java similarity index 98% rename from core/src/test/java/org/springframework/ws/endpoint/PayloadEndpointAdapterTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapterTest.java index 56b88fa8..5bddfdd6 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/PayloadEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.io.StringReader; import java.io.StringWriter; diff --git a/core/src/test/java/org/springframework/ws/endpoint/SaxPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java similarity index 98% rename from core/src/test/java/org/springframework/ws/endpoint/SaxPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java index 3c8785f4..79b55af3 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/SaxPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.transform.Source; +import org.springframework.xml.transform.StringSource; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import org.springframework.xml.transform.StringSource; - public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTestCase { protected PayloadEndpoint createNoResponseEndpoint() throws Exception { diff --git a/core/src/test/java/org/springframework/ws/endpoint/StaxEventPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java similarity index 98% rename from core/src/test/java/org/springframework/ws/endpoint/StaxEventPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java index 8e65a28a..ca718617 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/StaxEventPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import java.util.Collections; - import javax.xml.namespace.QName; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventReader; diff --git a/core/src/test/java/org/springframework/ws/endpoint/StaxStreamPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java similarity index 99% rename from core/src/test/java/org/springframework/ws/endpoint/StaxStreamPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java index 6c8496e1..04799b21 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/StaxStreamPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamConstants; diff --git a/core/src/test/java/org/springframework/ws/endpoint/XomPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/XomPayloadEndpointTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java index b0863298..c421cae1 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/XomPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint; +package org.springframework.ws.server.endpoint; import nu.xom.Element; diff --git a/core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadLoggingInterceptorTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java similarity index 98% rename from core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadLoggingInterceptorTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java index cda7afc4..a67c3101 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadLoggingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import junit.framework.TestCase; import org.apache.log4j.AppenderSkeleton; diff --git a/core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadTransformingInterceptorTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java similarity index 98% rename from core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadTransformingInterceptorTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java index 89808a07..16c5209f 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadTransformingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; diff --git a/core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java similarity index 99% rename from core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadValidatingInterceptorTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java index 5d8ad94b..c4b8a8d3 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/interceptor/PayloadValidatingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.interceptor; +package org.springframework.ws.server.endpoint.interceptor; import java.io.ByteArrayOutputStream; import java.io.InputStream; diff --git a/core/src/test/java/org/springframework/ws/endpoint/mapping/EndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java similarity index 95% rename from core/src/test/java/org/springframework/ws/endpoint/mapping/EndpointMappingTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java index 0f88491c..7008719e 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/mapping/EndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.mapping; +package org.springframework.ws.server.endpoint.mapping; import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.ws.EndpointInterceptor; -import org.springframework.ws.EndpointInvocationChain; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.interceptor.EndpointInterceptorAdapter; +import org.springframework.ws.server.EndpointInterceptor; +import org.springframework.ws.server.EndpointInvocationChain; +import org.springframework.ws.server.endpoint.interceptor.EndpointInterceptorAdapter; public class EndpointMappingTest extends TestCase { diff --git a/core/src/test/java/org/springframework/ws/endpoint/mapping/MapBasedSoapEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java similarity index 98% rename from core/src/test/java/org/springframework/ws/endpoint/mapping/MapBasedSoapEndpointMappingTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java index 5239c198..f7023071 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/mapping/MapBasedSoapEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.mapping; +package org.springframework.ws.server.endpoint.mapping; import java.util.Arrays; import java.util.Map; diff --git a/core/src/test/java/org/springframework/ws/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java similarity index 97% rename from core/src/test/java/org/springframework/ws/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java index 86402211..34248e9e 100644 --- a/core/src/test/java/org/springframework/ws/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.endpoint.mapping; +package org.springframework.ws.server.endpoint.mapping; import javax.xml.namespace.QName; diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMappingTest.java index 50ed4bbf..0fdb9ed7 100644 --- a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMappingTest.java @@ -18,12 +18,12 @@ package org.springframework.ws.soap.endpoint.mapping; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.ws.EndpointInvocationChain; -import org.springframework.ws.EndpointMapping; import org.springframework.ws.MockWebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.soap.SoapEndpointInvocationChain; +import org.springframework.ws.server.EndpointInvocationChain; +import org.springframework.ws.server.EndpointMapping; +import org.springframework.ws.soap.server.SoapEndpointInvocationChain; public class DelegatingSoapEndpointMappingTest extends TestCase { diff --git a/core/src/test/java/org/springframework/ws/soap/SoapMessageDispatcherTest.java b/core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java similarity index 97% rename from core/src/test/java/org/springframework/ws/soap/SoapMessageDispatcherTest.java rename to core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java index bd1705ad..7d7cb9f4 100644 --- a/core/src/test/java/org/springframework/ws/soap/SoapMessageDispatcherTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.soap; +package org.springframework.ws.soap.server; import java.util.Iterator; import java.util.Locale; @@ -28,6 +28,11 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.soap.SoapBody; +import org.springframework.ws.soap.SoapEndpointInterceptor; +import org.springframework.ws.soap.SoapHeader; +import org.springframework.ws.soap.SoapHeaderElement; +import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.saaj.SaajSoapMessage; import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import org.springframework.ws.soap.soap11.Soap11Fault; diff --git a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java index 3ff0e01b..bb75bbdc 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java @@ -17,9 +17,9 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletConfig; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.StaticWebApplicationContext; -import org.springframework.ws.MessageDispatcher; -import org.springframework.ws.endpoint.PayloadEndpointAdapter; -import org.springframework.ws.endpoint.mapping.PayloadRootQNameEndpointMapping; +import org.springframework.ws.server.MessageDispatcher; +import org.springframework.ws.server.endpoint.PayloadEndpointAdapter; +import org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping; import org.springframework.ws.soap.endpoint.SimpleSoapExceptionResolver; import org.springframework.ws.wsdl.wsdl11.SimpleWsdl11Definition; import org.w3c.dom.Document; diff --git a/core/src/test/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapterTest.java b/core/src/test/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapterTest.java index 2e717374..c06f9874 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapterTest.java @@ -24,11 +24,10 @@ import org.easymock.MockControl; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.ws.NoEndpointFoundException; +import org.springframework.ws.WebServiceMessage; import org.springframework.ws.WebServiceMessageFactory; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.MessageEndpoint; -import org.springframework.ws.soap.SoapBody; -import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.server.endpoint.MessageEndpoint; public class MessageEndpointHandlerAdapterTest extends TestCase { @@ -50,13 +49,9 @@ public class MessageEndpointHandlerAdapterTest extends TestCase { private MockControl messageControl; - private SoapMessage responseMock; + private WebServiceMessage responseMock; - private MockControl bodyControl; - - private SoapBody bodyMock; - - private SoapMessage requestMock; + private WebServiceMessage requestMock; protected void setUp() throws Exception { adapter = new MessageEndpointHandlerAdapter(); @@ -65,11 +60,9 @@ public class MessageEndpointHandlerAdapterTest extends TestCase { factoryControl = MockControl.createControl(WebServiceMessageFactory.class); factoryMock = (WebServiceMessageFactory) factoryControl.getMock(); adapter.setMessageFactory(factoryMock); - messageControl = MockControl.createControl(SoapMessage.class); - requestMock = (SoapMessage) messageControl.getMock(); - responseMock = (SoapMessage) messageControl.getMock(); - bodyControl = MockControl.createControl(SoapBody.class); - bodyMock = (SoapBody) bodyControl.getMock(); + messageControl = MockControl.createControl(WebServiceMessage.class); + requestMock = (WebServiceMessage) messageControl.getMock(); + responseMock = (WebServiceMessage) messageControl.getMock(); } public void testHandleNonPost() throws Exception { @@ -122,8 +115,7 @@ public class MessageEndpointHandlerAdapterTest extends TestCase { factoryControl.setMatcher(MockControl.ALWAYS_MATCHER); factoryControl.setReturnValue(requestMock); factoryControl.expectAndReturn(factoryMock.createWebServiceMessage(), responseMock); - messageControl.expectAndReturn(responseMock.getSoapBody(), bodyMock); - bodyControl.expectAndReturn(bodyMock.hasFault(), false); + messageControl.expectAndReturn(responseMock.hasFault(), false); responseMock.writeTo(new HttpServletTransportOutputStream(httpResponse)); messageControl.setMatcher(MockControl.ALWAYS_MATCHER); @@ -150,8 +142,7 @@ public class MessageEndpointHandlerAdapterTest extends TestCase { factoryControl.setMatcher(MockControl.ALWAYS_MATCHER); factoryControl.setReturnValue(requestMock); factoryControl.expectAndReturn(factoryMock.createWebServiceMessage(), responseMock); - messageControl.expectAndReturn(responseMock.getSoapBody(), bodyMock); - bodyControl.expectAndReturn(bodyMock.hasFault(), true); + messageControl.expectAndReturn(responseMock.hasFault(), true); responseMock.writeTo(new HttpServletTransportOutputStream(httpResponse)); messageControl.setMatcher(MockControl.ALWAYS_MATCHER); @@ -198,13 +189,11 @@ public class MessageEndpointHandlerAdapterTest extends TestCase { private void replayMockControls() { factoryControl.replay(); messageControl.replay(); - bodyControl.replay(); } private void verifyMockControls() { factoryControl.verify(); messageControl.verify(); - bodyControl.verify(); } } diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/invalidMessage.xml b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/invalidMessage.xml similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/invalidMessage.xml rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/invalidMessage.xml diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/productSchema.xsd b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/productSchema.xsd similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/productSchema.xsd rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/productSchema.xsd diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema.xsd b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/schema.xsd similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema.xsd rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/schema.xsd diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema2.xsd b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/schema2.xsd similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema2.xsd rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/schema2.xsd diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/sizeSchema.xsd b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/sizeSchema.xsd similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/sizeSchema.xsd rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/sizeSchema.xsd diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformInput.xml b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformInput.xml similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformInput.xml rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformInput.xml diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformOutput.xml b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformOutput.xml similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformOutput.xml rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformOutput.xml diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformation.xslt b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformation.xslt similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformation.xslt rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformation.xslt diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/validMessage.xml b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/validMessage.xml similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/validMessage.xml rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/validMessage.xml diff --git a/core/src/test/resources/org/springframework/ws/endpoint/interceptor/validSoapMessage.xml b/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/validSoapMessage.xml similarity index 100% rename from core/src/test/resources/org/springframework/ws/endpoint/interceptor/validSoapMessage.xml rename to core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/validSoapMessage.xml diff --git a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiverObjectSupport.java b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiverObjectSupport.java index edc84394..e3dff5d0 100644 --- a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiverObjectSupport.java +++ b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiverObjectSupport.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.jms.support.JmsUtils; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; -import org.springframework.ws.endpoint.MessageEndpoint; +import org.springframework.ws.server.endpoint.MessageEndpoint; import org.springframework.ws.transport.MessageReceiverObjectSupport; import org.springframework.ws.transport.TransportInputStream; import org.springframework.ws.transport.TransportOutputStream; diff --git a/sandbox/src/main/java/org/springframework/ws/transport/jms/MessageEndpointMessageListener.java b/sandbox/src/main/java/org/springframework/ws/transport/jms/MessageEndpointMessageListener.java index b5191913..67f7c183 100644 --- a/sandbox/src/main/java/org/springframework/ws/transport/jms/MessageEndpointMessageListener.java +++ b/sandbox/src/main/java/org/springframework/ws/transport/jms/MessageEndpointMessageListener.java @@ -34,7 +34,7 @@ import org.springframework.jms.listener.SessionAwareMessageListener; * * @author Arjen Poutsma * @see #setMessageFactory(org.springframework.ws.WebServiceMessageFactory) - * @see #setMessageEndpoint(org.springframework.ws.endpoint.MessageEndpoint) + * @see #setMessageEndpoint(org.springframework.ws.server.endpoint.MessageEndpoint) */ public class MessageEndpointMessageListener extends JmsMessageReceiverObjectSupport implements SessionAwareMessageListener { diff --git a/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java b/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java index 3ccfce95..c7b2ab49 100644 --- a/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java +++ b/sandbox/src/test/java/org/springframework/ws/transport/jms/MessageEndpointMessageListenerTest.java @@ -31,7 +31,7 @@ import org.codehaus.activemq.message.ActiveMQTopic; import org.easymock.MockControl; import org.springframework.ws.MockWebServiceMessageFactory; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.endpoint.MessageEndpoint; +import org.springframework.ws.server.endpoint.MessageEndpoint; public class MessageEndpointMessageListenerTest extends TestCase {