Merge branch 'SWS-920' of https://github.com/marschall/spring-ws into marschall-SWS-920
This commit is contained in:
Greg Turnquist
@@ -65,8 +65,10 @@ configure(allprojects) {
|
||||
ext.javadocLinks = [
|
||||
"http://docs.oracle.com/javase/7/docs/api/",
|
||||
"http://docs.oracle.com/javaee/6/api/",
|
||||
"http://jackson.codehaus.org/1.9.12/javadoc/",
|
||||
"http://fasterxml.github.com/jackson-core/javadoc/2.2.2/",
|
||||
"http://docs.spring.io/spring/docs/current/javadoc-api/",
|
||||
"https://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/",
|
||||
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
|
||||
"http://fasterxml.github.com/jackson-core/javadoc/2.2.0/",
|
||||
] as String[]
|
||||
|
||||
}
|
||||
|
||||
@@ -73,9 +73,9 @@ public abstract class AbstractDom4jPayloadEndpoint extends TransformerObjectSupp
|
||||
* Returns the payload element of the given source.
|
||||
*
|
||||
* <p>Default implementation checks whether the source is a {@link javax.xml.transform.dom.DOMSource}, and uses a
|
||||
* {@link org.jdom.input.DOMBuilder} to create a JDOM {@link org.jdom.Element}. In all other cases, or when
|
||||
* {@link org.dom4j.io.DOMReader} to create a JDOM {@link org.dom4j.Element}. In all other cases, or when
|
||||
* {@linkplain #setAlwaysTransform(boolean) alwaysTransform} is {@code true}, the source is transformed into a
|
||||
* {@link org.jdom.transform.JDOMResult}, which is more expensive. If the passed source is {@code null}, {@code
|
||||
* {@link org.dom4j.io.DocumentResult}, which is more expensive. If the passed source is {@code null}, {@code
|
||||
* null} is returned.
|
||||
*
|
||||
* @param source the source to return the root element of; can be {@code null}
|
||||
|
||||
@@ -114,7 +114,7 @@ public class ActionCallback implements WebServiceMessageCallback {
|
||||
*
|
||||
* @param action the value of the action property
|
||||
* @param version the WS-Addressing version to use
|
||||
* @param action the value of the destination property
|
||||
* @param to the value of the destination property
|
||||
*/
|
||||
public ActionCallback(URI action, AddressingVersion version, URI to) {
|
||||
Assert.notNull(action, "'action' must not be null");
|
||||
@@ -127,7 +127,6 @@ public class ActionCallback implements WebServiceMessageCallback {
|
||||
|
||||
/**
|
||||
* Returns the WS-Addressing version
|
||||
* @return
|
||||
*/
|
||||
public AddressingVersion getVersion() {
|
||||
return version;
|
||||
|
||||
@@ -115,7 +115,7 @@ public abstract class AxiomUtils {
|
||||
* @param envelope the SOAP envelope to be converted
|
||||
* @return the converted document
|
||||
* @throws IllegalArgumentException in case of errors
|
||||
* @see org.apache.rampart.util.Axis2Util.getDocumentFromSOAPEnvelope(SOAPEnvelope, boolean)
|
||||
* @see org.apache.rampart.util.Axis2Util#getDocumentFromSOAPEnvelope(SOAPEnvelope, boolean)
|
||||
*/
|
||||
public static Document toDocument(SOAPEnvelope envelope) {
|
||||
try {
|
||||
@@ -144,7 +144,7 @@ public abstract class AxiomUtils {
|
||||
* @param document the document to be converted
|
||||
* @return the converted envelope
|
||||
* @throws IllegalArgumentException in case of errors
|
||||
* @see org.apache.rampart.util.Axis2Util.getSOAPEnvelopeFromDOMDocument(Document, boolean)
|
||||
* @see org.apache.rampart.util.Axis2Util#getSOAPEnvelopeFromDOMDocument(Document, boolean)
|
||||
*/
|
||||
public static SOAPEnvelope toEnvelope(Document document) {
|
||||
try {
|
||||
|
||||
@@ -37,13 +37,11 @@ import org.springframework.xml.namespace.QNameUtils;
|
||||
* method parameters must be annotated with {@link SoapHeader} to indicate the SOAP header to resolve. This resolver
|
||||
* supports simple {@link SoapHeaderElement} parameters and {@link List} parameters for elements that appear multiple
|
||||
* times in the same SOAP header. </p> The following snippet shows an example of supported declarations.
|
||||
* <pre>
|
||||
* {@code
|
||||
* <pre><code>
|
||||
* public void soapHeaderElement(@SoapHeader("{http://springframework.org/ws}header") SoapHeaderElement element)
|
||||
*
|
||||
* <p>public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List<SoapHeaderElement>
|
||||
* elements)
|
||||
* </pre>
|
||||
* public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List<SoapHeaderElement> elements)
|
||||
* </code></pre>
|
||||
*
|
||||
* @author Tareq Abedrabbo
|
||||
* @author Arjen Poutsma
|
||||
|
||||
@@ -29,6 +29,7 @@ import org.springframework.http.client.ClientHttpRequest;
|
||||
import org.springframework.http.client.ClientHttpResponse;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.ws.WebServiceMessage;
|
||||
import org.springframework.ws.transport.WebServiceConnection;
|
||||
|
||||
/**
|
||||
* Implementation of the {@link WebServiceConnection} interface that is based on the
|
||||
|
||||
@@ -18,6 +18,7 @@ package org.springframework.ws.transport.http.support;
|
||||
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
import org.springframework.web.WebApplicationInitializer;
|
||||
import org.springframework.web.context.WebApplicationContext;
|
||||
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
|
||||
import org.springframework.web.servlet.support.AbstractDispatcherServletInitializer;
|
||||
|
||||
@@ -122,7 +122,7 @@ public abstract class AbstractMessageDispatcherServletInitializer extends
|
||||
|
||||
/**
|
||||
* Specify the servlet mapping(s) for the {@code MessageDispatcherServlet}.
|
||||
* Defaults to {@link #DEFAULT_SERVLET_MAPPING}.
|
||||
* Defaults to {@link #DEFAULT_SERVLET_MAPPINGS}.
|
||||
* @see #registerMessageDispatcherServlet(ServletContext)
|
||||
*/
|
||||
protected String[] getServletMappings() {
|
||||
|
||||
@@ -24,7 +24,7 @@ import org.springframework.ws.wsdl.WsdlDefinition;
|
||||
* <p>Just a marker interface at the moment.
|
||||
*
|
||||
* @author Arjen Poutsma
|
||||
* @see Wsdl11DefinitionBuilder
|
||||
* @see DefaultWsdl11Definition
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public interface Wsdl11Definition extends WsdlDefinition {
|
||||
|
||||
@@ -65,17 +65,28 @@ import org.springframework.ws.soap.security.wss4j.callback.UsernameTokenPrincipa
|
||||
*
|
||||
* <p>Valid <strong>validation</strong> actions are:
|
||||
*
|
||||
* <blockquote><table> <tr><th>Validation action</th><th>Description</th></tr> <tr><td>{@code UsernameToken}</td><td>Validates
|
||||
* username token</td></tr> <tr><td>{@code Timestamp}</td><td>Validates the timestamp</td></tr>
|
||||
* <tr><td>{@code Encrypt}</td><td>Decrypts the message</td></tr> <tr><td>{@code Signature}</td><td>Validates
|
||||
* the signature</td></tr> <tr><td>{@code NoSecurity}</td><td>No action performed</td></tr> </table></blockquote>
|
||||
* <blockquote>
|
||||
* <table>
|
||||
* <tr><th>Validation action</th><th>Description</th></tr>
|
||||
* <tr><td>{@code UsernameToken}</td><td>Validates username token</td></tr>
|
||||
* <tr><td>{@code Timestamp}</td><td>Validates the timestamp</td></tr>
|
||||
* <tr><td>{@code Encrypt}</td><td>Decrypts the message</td></tr>
|
||||
* <tr><td>{@code Signature}</td><td>Validates the signature</td></tr>
|
||||
* <tr><td>{@code NoSecurity}</td><td>No action performed</td></tr>
|
||||
* </table></blockquote>
|
||||
* <p>
|
||||
* <strong>Securement</strong> actions are: <blockquote><table> <tr><th>Securement action</th><th>Description</th></tr>
|
||||
* <tr><td>{@code UsernameToken</td>}<td>Adds a username token</td></tr> <tr><td>{@code UsernameTokenSignature</td>}<td>Adds
|
||||
* a username token and a signature username token secret key</td></tr> <tr><td>{@code Timestamp</td>}<td>Adds a
|
||||
* timestamp</td></tr> <tr><td>{@code Encrypt</td>}<td>Encrypts the response</td></tr>
|
||||
* <tr><td>{@code Signature</td>}<td>Signs the response</td></tr> <tr><td>{@code NoSecurity</td>}<td>No action
|
||||
* performed</td></tr> </table></blockquote>
|
||||
* <strong>Securement</strong> actions are:
|
||||
*
|
||||
* <blockquote>
|
||||
* <table>
|
||||
* <tr><th>Securement action</th><th>Description</th></tr>
|
||||
* <tr><td>{@code UsernameToken}</td><td>Adds a username token</td></tr>
|
||||
* <tr><td>{@code UsernameTokenSignature}</td><td>Adds a username token and a signature username token secret key</td></tr>
|
||||
* <tr><td>{@code Timestamp}</td><td>Adds a timestamp</td></tr>
|
||||
* <tr><td>{@code Encrypt}</td><td>Encrypts the response</td></tr>
|
||||
* <tr><td>{@code Signature}</td><td>Signs the response</td></tr>
|
||||
* <tr><td>{@code NoSecurity}</td><td>No action performed</td></tr>
|
||||
* </table></blockquote>
|
||||
*
|
||||
* <p>The order of the actions that the client performed to secure the messages is significant and is enforced by the
|
||||
* interceptor.
|
||||
@@ -194,11 +205,11 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
|
||||
/**
|
||||
* Property to define which parts of the request shall be encrypted.
|
||||
*
|
||||
* <p>The value of this property is a list of semi-colon separated element names that identify the elements to encrypt.
|
||||
* <p>The value of this property is a list of semicolon separated element names that identify the elements to encrypt.
|
||||
* An encryption mode specifier and a namespace identification, each inside a pair of curly brackets, may precede
|
||||
* each element name.
|
||||
*
|
||||
* <p>The encryption mode specifier is either {@code{Content}} or {@code{Element}}. Please refer to the W3C
|
||||
* <p>The encryption mode specifier is either {@code {Content}} or {@code {Element}}. Please refer to the W3C
|
||||
* XML Encryption specification about the differences between Element and Content encryption. The encryption mode
|
||||
* defaults to {@code Content} if it is omitted. Example of a list:
|
||||
* <pre>
|
||||
@@ -323,7 +334,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
|
||||
* sensitive string)
|
||||
*
|
||||
* <p>If there is no other element in the request with a local name of {@code Body} then the SOAP namespace
|
||||
* identifier can be empty ({@code{}}).
|
||||
* identifier can be empty ({@code {}}).
|
||||
*/
|
||||
public void setSecurementSignatureParts(String securementSignatureParts) {
|
||||
handler.setOption(WSHandlerConstants.SIGNATURE_PARTS, securementSignatureParts);
|
||||
|
||||
@@ -145,7 +145,7 @@ public abstract class QNameUtils {
|
||||
|
||||
/**
|
||||
* Parse the given qualified name string into a {@code QName}. Expects the syntax {@code localPart},
|
||||
* {@code{namespace}localPart}, or {@code{namespace}prefix:localPart}. This format resembles the
|
||||
* {@code {namespace}localPart}, or {@code {namespace}prefix:localPart}. This format resembles the
|
||||
* {@code toString()} representation of {@code QName} itself, but allows for prefixes to be specified as
|
||||
* well.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user