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} diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java index 916c52c4..56666021 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java @@ -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; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java index 86f2594d..d880658a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java @@ -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 { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java index cc3b8ca2..67d9c187 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java @@ -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.
The following snippet shows an example of supported declarations. - *
- * {@code
+ *
* public void soapHeaderElement(@SoapHeader("{http://springframework.org/ws}header") SoapHeaderElement element)
*
- * public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List
- * elements)
- *
+ * public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List<SoapHeaderElement> elements)
+ *
*
* @author Tareq Abedrabbo
* @author Arjen Poutsma
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java
index a07d562f..3bd4fd89 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java
@@ -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
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractAnnotationConfigMessageDispatcherServletInitializer.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractAnnotationConfigMessageDispatcherServletInitializer.java
index e8cec1a4..dfb2702d 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractAnnotationConfigMessageDispatcherServletInitializer.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractAnnotationConfigMessageDispatcherServletInitializer.java
@@ -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;
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractMessageDispatcherServletInitializer.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractMessageDispatcherServletInitializer.java
index aa7aad9a..8e3929f4 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractMessageDispatcherServletInitializer.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractMessageDispatcherServletInitializer.java
@@ -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() {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java
index b32511bb..6f52e8ce 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java
@@ -24,7 +24,7 @@ import org.springframework.ws.wsdl.WsdlDefinition;
* Just a marker interface at the moment. * * @author Arjen Poutsma - * @see Wsdl11DefinitionBuilder + * @see DefaultWsdl11Definition * @since 1.0.0 */ public interface Wsdl11Definition extends WsdlDefinition { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java index fbfaa67a..f3e10027 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java @@ -65,17 +65,28 @@ import org.springframework.ws.soap.security.wss4j.callback.UsernameTokenPrincipa * *
Valid validation actions are: * - *
+ *
Validation action Description {@code UsernameToken} Validates - * username token - * {@code Timestamp} Validates the timestamp {@code Encrypt} Decrypts the message {@code Signature} Validates - * the signature {@code NoSecurity} No action performed
+ **+ *
+ * Validation action Description + * {@code UsernameToken} Validates username token + * {@code Timestamp} Validates the timestamp + * {@code Encrypt} Decrypts the message + * {@code Signature} Validates the signature + * {@code NoSecurity} No action performed
- * Securement actions are:
+ * Securement actions are: + * + *
- * Securement action Description {@code UsernameToken }Adds a username token {@code UsernameTokenSignature }Adds - * a username token and a signature username token secret key {@code Timestamp }Adds a - * timestamp - * {@code Encrypt }Encrypts the response {@code Signature }Signs the response {@code NoSecurity }No action - * performed
+ ** *+ *
+ * Securement action Description + * {@code UsernameToken} Adds a username token + * {@code UsernameTokenSignature} Adds a username token and a signature username token secret key + * {@code Timestamp} Adds a timestamp + * {@code Encrypt} Encrypts the response + * {@code Signature} Signs the response + * {@code NoSecurity} No action performed
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. * - *
The value of this property is a list of semi-colon separated element names that identify the elements to encrypt. + *
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. * - *
The encryption mode specifier is either {@code{Content}} or {@code{Element}}. Please refer to the W3C + *
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: *
@@ -323,7 +334,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * sensitive string) * *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); diff --git a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java index d7c5bc98..3950f169 100644 --- a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java @@ -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. *